diff --git a/vMinecraftChat.java b/vMinecraftChat.java
index 6aa09c260..3f57430f6 100644
--- a/vMinecraftChat.java
+++ b/vMinecraftChat.java
@@ -368,9 +368,10 @@ public class vMinecraftChat {
 	//Output:	boolean: If this feature is enabled
 	//Use:		/me but with our custom colors applied
 	//=====================================================================
-        public static boolean emote(Player player, String[] message)
+        public static boolean emote(Player player, String message)
         {
-            String[] msg = wordWrap("* " + getName(player) + Colors.White + message);
+            String temp = message.toString();
+            String[] msg = wordWrap("* " + getName(player) + " " + Colors.White + temp);
             for(String str: msg)
 				gmsg(str);
             return true;
diff --git a/vMinecraftCommands.java b/vMinecraftCommands.java
index 9f7ca15d0..9917dddab 100644
--- a/vMinecraftCommands.java
+++ b/vMinecraftCommands.java
@@ -55,7 +55,9 @@ public class vMinecraftCommands{
 	//=====================================================================
     public static int me(Player player, String[] args)
     {
-        vMinecraftChat.emote(player, args);
+        String str = etc.combineSplit(0, args, " ");
+        if (args.length < 1) {return EXIT_FAIL;}
+        vMinecraftChat.emote(player, str);
         return EXIT_SUCCESS;
     }
 	//=====================================================================