1 files changed, 9 insertions, 2 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index d3c79c10f..c8d4f2b21 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -624,11 +624,18 @@ impHandler(talkRaw)
 
 impHandler(talkPet)
 {
+    std::string args = event.args;
     // in future probably need add channel detection
     if (!localPlayer->getPets().empty())
-        chatHandler->talkPet(event.args, GENERAL_CHANNEL);
+    {
+        if (findCutFirst(args, "/me "))
+            args = textToMe(args);
+        chatHandler->talkPet(args, GENERAL_CHANNEL);
+    }
     else
-        chatHandler->talk(event.args, GENERAL_CHANNEL);
+    {
+        chatHandler->talk(args, GENERAL_CHANNEL);
+    }
     return true;
 }