From 4c90bd9b4686f63b3d13270a58448063aade82b3 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 27 Jul 2014 22:31:33 +0200
Subject: [PATCH] fixed bug in message parser

---
 src/eu/siacs/conversations/parser/MessageParser.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index a4fcc810d..616e6f4b4 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