Index: binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js
@@ -11,7 +11,7 @@
 	onPrivateMessage(message)
 	{
 		// Announcements and the Message of the Day are sent by the server directly
-		if (!message.from)
+		if (!message.from && message.text.length > 0)
 			messageBox(
 				400, 250,
 				message.text.trim(),
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js
@@ -19,7 +19,7 @@
 	onPrivateMessage(message)
 	{
 		// We intend to not support private messages between users
-		if (!message.from || Engine.LobbyGetPlayerRole(message.from) == "moderator")
+		if ((!message.from && message.text.length > 0) || Engine.LobbyGetPlayerRole(message.from) == "moderator")
 			// some XMPP clients send trailing whitespace
 			this.chatMessagesPanel.addText(message.time, this.chatMessageFormat.format(message));
 	}