diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index a4fcc810d07272ff0228bb60ae05e25920209ae6..616e6f4b46e05f7d5ba392b1b56d4c3db7630a73 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -174,12 +174,16 @@ public class MessageParser extends AbstractParser implements
 		}
 		if (status == Message.STATUS_RECIEVED) {
 			fullJid = message.getAttribute("from");
-			updateLastseen(message, account, true);
+			if (fullJid == null ) {
+				return null;
+			} else {
+				updateLastseen(message, account, true);
+			}
 		} else {
 			fullJid = message.getAttribute("to");
-		}
-		if (fullJid==null) {
-			return null;
+			if (fullJid == null) {
+				return null;
+			}
 		}
 		String[] parts = fullJid.split("/");
 		Conversation conversation = mXmppConnectionService