2 files changed, 22 insertions, 0 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 08b3e0014..858b5acbb 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -211,4 +211,25 @@ impHandler(msg)
     return true;
 }
 
+impHandler(query)
+{
+    if (chatWindow)
+    {
+        if (chatWindow->addWhisperTab(event.args, true))
+        {
+            chatWindow->saveState();
+            return true;
+        }
+    }
+
+    if (event.tab)
+    {
+        // TRANSLATORS: new whisper query
+        event.tab->chatLog(strprintf(_("Cannot create a whisper tab for nick "
+            "\"%s\"! It either already exists, or is you."),
+            event.args.c_str()), ChatMsgType::BY_SERVER);
+    }
+    return true;
+}
+
 }  // namespace Actions
diff --git a/src/actions/chat.h b/src/actions/chat.h
index b653e6efb..fe35021be 100644
--- a/src/actions/chat.h
+++ b/src/actions/chat.h
@@ -36,6 +36,7 @@ namespace Actions
     decHandler(scrollChatUp);
     decHandler(scrollChatDown);
     decHandler(msg);
+    decHandler(query);
 }  // namespace Actions
 
 #undef decHandler