don't correct a message if that would create a duplicate

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 531e29629..227fb9e11 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -485,7 +485,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                             || replacedMessage.getFingerprint().equals(message.getFingerprint());
                     final boolean trueCountersMatch = replacedMessage.getTrueCounterpart() != null
                             && replacedMessage.getTrueCounterpart().equals(message.getTrueCounterpart());
-                    if (fingerprintsMatch && (trueCountersMatch || !conversationMultiMode)) {
+                    final boolean duplicate = conversation.hasDuplicateMessage(message);
+                    if (fingerprintsMatch && (trueCountersMatch || !conversationMultiMode) && !duplicate) {
                         Log.d(Config.LOGTAG, "replaced message '" + replacedMessage.getBody() + "' with '" + message.getBody() + "'");
                         synchronized (replacedMessage) {
                             final String uuid = replacedMessage.getUuid();