Index: ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js	(revision 24608)
+++ ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/AnnouncementHandler.js	(revision 24609)
@@ -1,20 +1,20 @@
 /**
  * This class informs clients of the server if an announcement had been broadcasted.
  */
 class AnnouncementHandler
 {
 	constructor(xmppMessages)
 	{
 		xmppMessages.registerXmppMessageHandler("chat", "private-message", this.onPrivateMessage.bind(this));
 	}
 
 	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(),
 				translate("Notice"));
 	}
 }
Index: ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js	(revision 24608)
+++ ps/trunk/binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageEvents.js	(revision 24609)
@@ -1,26 +1,26 @@
 /**
  * This is the class (and only class) that formats textual messages submitted by chat participants.
  */
 ChatMessageEvents.PlayerChat = class
 {
 	constructor(xmppMessages, chatMessagesPanel)
 	{
 		this.chatMessagesPanel = chatMessagesPanel;
 		this.chatMessageFormat = new ChatMessageFormat();
 		xmppMessages.registerXmppMessageHandler("chat", "room-message", this.onRoomMessage.bind(this));
 		xmppMessages.registerXmppMessageHandler("chat", "private-message", this.onPrivateMessage.bind(this));
 	}
 
 	onRoomMessage(message)
 	{
 		this.chatMessagesPanel.addText(message.time, this.chatMessageFormat.format(message));
 	}
 
 	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));
 	}
 };