1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 3714ac90..9944f364 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -320,7 +320,14 @@ public class MessageParser extends AbstractParser implements
 		Message finishedMessage = new Message(conversation,content,encryption,status);
 		finishedMessage.setTime(timestamp);
 		finishedMessage.setCounterpart(counterpart);
-		Log.d(Config.LOGTAG,"received mam message "+content);
+		finishedMessage.setRemoteMsgId(message.getAttribute("id"));
+		finishedMessage.setServerMsgId(result.getAttribute("id"));
+		if (conversation.hasDuplicateMessage(finishedMessage)) {
+			Log.d(Config.LOGTAG, "received mam message " + content+ " (duplicate)");
+			return null;
+		} else {
+			Log.d(Config.LOGTAG, "received mam message " + content);
+		}
 		return finishedMessage;
 	}