diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp
index 1554fbcf..9afc9c20 100644
--- a/src/gui/qt/chattools/chattools.cpp
+++ b/src/gui/qt/chattools/chattools.cpp
@@ -126,7 +126,13 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
         }
 
         if(!nickFoundOnIgnoreList) {
-            myTextBrowser->append(playerName + ": " + tempMsg);
+
+            if(message.indexOf(QString("/me"))==0) {
+                myTextBrowser->append(tempMsg.replace("/me","<i>*"+playerName+" ")+"</i>");
+            }
+            else {
+                myTextBrowser->append(playerName + ": " + tempMsg);
+            }
         }
     }
 }