diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 6da26fd11..209a2a689 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -293,8 +293,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 		}
 		boolean notify = false;
 
-		if (from == null) {
-			Log.d(Config.LOGTAG, "no from in: " + packet.toString());
+		if (from == null || !InvalidJid.isValid(from) || !InvalidJid.isValid(to)) {
+			Log.e(Config.LOGTAG, "encountered invalid message from='" + from + "' to='" + to + "'");
 			return;
 		}