double check that muc message is ours if true jid is known

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index a1b6f498a..b9a132cf3 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -610,8 +610,13 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 } else {
                     trueCounterpart = fallback;
                 }
-                if (trueCounterpart != null && trueCounterpart.asBareJid().equals(account.getJid().asBareJid())) {
-                    status = isTypeGroupChat ? Message.STATUS_SEND_RECEIVED : Message.STATUS_SEND;
+                if (trueCounterpart != null) {
+                    if (trueCounterpart.asBareJid().equals(account.getJid().asBareJid())) {
+                        status = isTypeGroupChat ? Message.STATUS_SEND_RECEIVED : Message.STATUS_SEND;
+                    } else {
+                        status = Message.STATUS_RECEIVED;
+                        message.setCarbon(false);
+                    }
                 }
                 message.setStatus(status);
                 message.setTrueCounterpart(trueCounterpart);