1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 1bd0f4338..d1b69b0ea 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -735,7 +735,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                             }
                         } else {
                             final Jid fallback = conversation.getMucOptions().getTrueCounterpart(counterpart);
-                            Jid trueJid = getTrueCounterpart(query != null ? mucUserElement : null, fallback);
+                            Jid trueJid = getTrueCounterpart((query != null && query.safeToExtractTrueCounterpart()) ? mucUserElement : null, fallback);
                             ReadByMarker readByMarker = ReadByMarker.from(counterpart, trueJid);
                             if (message.addReadByMarker(readByMarker)) {
                                 Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": added read by (" + readByMarker.getRealJid() + ") to message '" + message.getBody() + "'");