From 3e0636367a733285526c709138110ddb86899196 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 26 Aug 2015 11:39:18 +0200
Subject: [PATCH] Revert "improved compatibility with muc components that
 change the message id"

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

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