From 2eef37174e1034995d79af03cd1c0a3f8f9f3488 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 31 Jan 2016 14:42:35 +0100
Subject: fixed false set of subject in conference with empty body tag

---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 345e8395..d8eae969 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -454,7 +454,7 @@ public class MessageParser extends AbstractParser implements
 					mXmppConnectionService.getNotificationService().pushFromBacklog(message);
 				}
 			}
-		} else { //no body
+		} else if (!packet.hasChild("body")){ //no body
 			if (isTypeGroupChat) {
 				Conversation conversation = mXmppConnectionService.find(account, from.toBareJid());
 				if (packet.hasChild("subject")) {
-- 
cgit v1.2.3