improved compatibility with muc components that change the message id

1 files 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;
 						}