diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
index 24316d93f..aca821aac 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -23,14 +23,20 @@ public class Commandmute extends EssentialsCommand
 
 		User p = getPlayer(server, args, 0);
 		long muteTimestamp = 0;
-		if (args.length > 1) {
+		if (args.length > 1)
+		{
 			String time = getFinalArg(args, 1);
 			muteTimestamp = Util.parseDateDiff(time, true);
 		}
 		p.setMuteTimeout(muteTimestamp);
 		charge(sender);
-		
-		
-		sender.sendMessage(Util.format("mutedPlayer", p.getDisplayName(), (p.toggleMuted() ? Util.i18n("muted") : Util.i18n("unmuted")), (muteTimestamp > 0 ? Util.i18n("for") + Util.formatDateDiff(muteTimestamp) : "")));
+
+
+		sender.sendMessage(
+				p.toggleMuted()
+				? (muteTimestamp > 0
+				   ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp))
+				   : Util.format("mutedPlayer", p.getDisplayName()))
+				: Util.format("unmutedPlayer", p.getDisplayName()));
 	}
 }
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index b58f50424..9f18eda84 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -195,10 +195,9 @@ mailCleared = \u00a77Mail Cleared!
 voiceSilenced = \u00a77Your voice has been silenced
 noMotd = \u00a7cThere is no message of the day."
 me = me
-mutedPlayer = Player {0} {1} {2} {3}.
-muted = muted
-unMuted = unmuted
-for = for
+mutedPlayerFor = Player {0} muted for {1}.
+mutedPlayer = Player {0} muted.
+unmutedPlayer = Player {0} unmuted.
 nickOthersPermission = \u00a7cYou do not have permission to change the nickname of others
 nickNoMore = \u00a7You no longer have a nickname.
 nickNamesAlpha = \u00a7cNicknames must be alphanumeric.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 0ed3b641a..0f5b90ba6 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -195,10 +195,9 @@ mailCleared = \u00a77Mail Cleared!
 voiceSilenced = \u00a77Your voice has been silenced
 noMotd = \u00a7cThere is no message of the day."
 me = me
-mutedPlayer = Player {0} {1} {2} {3}.
-muted = muted
-unMuted = unmuted
-for = for
+mutedPlayerFor = Player {0} muted for {1}.
+mutedPlayer = Player {0} muted.
+unmutedPlayer = Player {0} unmuted.
 nickOthersPermission = \u00a7cYou do not have permission to change the nickname of others
 nickNoMore = \u00a7You no longer have a nickname.
 nickNamesAlpha = \u00a7cNicknames must be alphanumeric.