fixed behaviour in message parser when doing mam catchup

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 88cdefc8c..92283e80c 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -544,7 +544,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 query.incrementActualMessageCount();
             }
 
-            if (query == null || !query.isCatchup()) { //either no mam or catchup
+            if (query == null || query.isCatchup()) { //either no mam or catchup
                 if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) {
                     mXmppConnectionService.markRead(conversation);
                     if (query == null) {
@@ -582,7 +582,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
             } else if (notify) {
                 if (query == null) {
                     mXmppConnectionService.getNotificationService().push(message);
-                } else if (query.getWith() == null) { // mam catchup
+                } else if (query.isCatchup()) { // mam catchup
                     mXmppConnectionService.getNotificationService().pushFromBacklog(message);
                 }
             }