2 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 809cee166..502f2638d 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -897,6 +897,20 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         }
     }
 
+    public boolean possibleDuplicate(final String serverMsgId, final String remoteMsgId) {
+        if (serverMsgId == null || remoteMsgId == null) {
+            return false;
+        }
+        synchronized (this.messages) {
+            for (Message message : this.messages) {
+                if (serverMsgId.equals(message.getServerMsgId()) || remoteMsgId.equals(message.getRemoteMsgId())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     public MamReference getLastMessageTransmitted() {
         final MamReference lastClear = getLastClearHistory();
         MamReference lastReceived = new MamReference(0);
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 6d11d54d3..abeda3ad3 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -45,6 +45,7 @@ public class Message extends AbstractEntity {
     public static final int ENCRYPTION_DECRYPTION_FAILED = 4;
     public static final int ENCRYPTION_AXOLOTL = 5;
     public static final int ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE = 6;
+    public static final int ENCRYPTION_AXOLOTL_FAILED = 7;
 
     public static final int TYPE_TEXT = 0;
     public static final int TYPE_IMAGE = 1;
@@ -913,7 +914,7 @@ public class Message extends AbstractEntity {
         if (encryption == ENCRYPTION_DECRYPTED || encryption == ENCRYPTION_DECRYPTION_FAILED) {
             return ENCRYPTION_PGP;
         }
-        if (encryption == ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) {
+        if (encryption == ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE || encryption == ENCRYPTION_AXOLOTL_FAILED) {
             return ENCRYPTION_AXOLOTL;
         }
         return encryption;