deduplicate every message with a stanza-id from the server

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index ba8995108..1551f691a 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -527,9 +527,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 return;
             }
 
-            boolean checkForDuplicates = query != null
-                    || (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))
-                    || message.getType() == Message.TYPE_PRIVATE;
+            boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))
+                    || message.getType() == Message.TYPE_PRIVATE
+                    || message.getServerMsgId() != null;
             if (checkForDuplicates && conversation.hasDuplicateMessage(message)) {
                 Log.d(Config.LOGTAG, "skipping duplicate message from " + message.getCounterpart().toString() + " " + message.getBody());
                 return;