1 files changed, 2 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 9d64110a8..64bb0b2d5 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -502,8 +502,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 Jid trueCounterpart;
                 if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
                     trueCounterpart = message.getTrueCounterpart();
-                } else if (Config.PARSE_REAL_JID_FROM_MUC_MAM) {
-                    trueCounterpart = getTrueCounterpart(query != null ? mucUserElement : null, fallback);
+                } else if (query != null && query.safeToExtractTrueCounterpart()) {
+                    trueCounterpart = getTrueCounterpart(mucUserElement, fallback);
                 } else {
                     trueCounterpart = fallback;
                 }