diff --git a/UI/ChatScreen.h b/UI/ChatScreen.h
index 035624648c..c377f1fdcd 100644
--- a/UI/ChatScreen.h
+++ b/UI/ChatScreen.h
@@ -11,7 +11,7 @@ public:
 	void dialogFinished(const Screen *dialog, DialogResult result) override;
 	bool touch(const TouchInput &touch) override;
 	void postRender() override;
-	void UpdateChat();
+	virtual void UpdateChat();
 private:
 	UI::EventReturn OnSubmit(UI::EventParams &e);
 	UI::TextEdit *chatEdit_;
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index d575301016..d50fd6451b 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -858,8 +858,16 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
 			g_Config.proAdhocServer = setString;
 		if (inputboxValue[0] == "nickname")
 			g_Config.sNickName = setString;
-		if (inputboxValue[0] == "Chat")
-			sendChat(setString);
+		if (inputboxValue[0] == "Chat") {
+			if (inputboxValue.size() > 2) 
+			{
+				std::string chatString = value;
+				chatString.erase(0, 5);
+				sendChat(chatString);
+			} else {
+				sendChat(setString);
+			}
+		}
 		inputboxValue.clear();
 	}
 	if (msg == "bgImage_updated") {