4 files changed, 11 insertions, 2 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index b0642f953..3ce066c95 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -39,6 +39,7 @@
 #include "net/serverfeatures.h"
 
 #include "utils/booleanoptions.h"
+#include "utils/chatutils.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
@@ -318,7 +319,7 @@ impHandler(party)
 
 impHandler(me)
 {
-    outString(event.tab, strprintf("*%s*", event.args.c_str()), event.args);
+    outString(event.tab, textToMe(event.args), event.args);
     return true;
 }
 
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index f82277171..2830df0f8 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -30,6 +30,7 @@
 
 #include "gui/widgets/windowcontainer.h"
 
+#include "utils/chatutils.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
@@ -75,7 +76,7 @@ void WhisperTab::handleCommand(const std::string &msg)
 
     if (type == "me")
     {
-        std::string str = strprintf("*%s*", args.c_str());
+        std::string str = textToMe(args);
         chatHandler->privateMessage(mNick, str);
         if (localPlayer)
             chatLog(localPlayer->getName(), str);
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 105b7ace5..c3a877fae 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -175,3 +175,8 @@ void replaceVars(std::string &str)
         }
     }
 }
+
+std::string textToMe(const std::string &str)
+{
+    return strprintf("*%s*", str.c_str());
+}
diff --git a/src/utils/chatutils.h b/src/utils/chatutils.h
index 7c7c0102f..664d887db 100644
--- a/src/utils/chatutils.h
+++ b/src/utils/chatutils.h
@@ -31,4 +31,6 @@ void outStringNormal(ChatTab *const tab,
 
 void replaceVars(std::string &str);
 
+std::string textToMe(const std::string &str);
+
 #endif  // UTILS_CHATUTILS_H