From df86b0fc47cb7af8e97826f97d0e202405cff414 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 2 Jun 2015 06:23:32 +0200
Subject: [PATCH] improved compatibility with muc components that change the
 message id

---
 .../java/eu/siacs/conversations/parser/MessageParser.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 898613e34..fe42a2ae5 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -269,9 +269,10 @@ public class MessageParser extends AbstractParser implements
 					status = Message.STATUS_SEND;
 					if (mXmppConnectionService.markMessage(conversation, remoteMsgId, Message.STATUS_SEND_RECEIVED)) {
 						return;
-					} else if (remoteMsgId == null) {
-						Message message = conversation.findSentMessageWithBody(packet.getBody());
+					} else {
+						Message message = conversation.findSentMessageWithBody(body);
 						if (message != null) {
+							message.setRemoteMsgId(remoteMsgId);
 							mXmppConnectionService.markMessage(message, Message.STATUS_SEND_RECEIVED);
 							return;
 						}