diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 84bfae21eaae65553d08d4d168d6b7fe98949111..bf85e79372d739848e6adf5672c865a435edb694 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -828,6 +828,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 } else if (message.getBody() == null || message.getBody().equals("") || message.getBody().equals(" ")) {
                     return;
                 }
+                if (replaceElement != null && !replaceElement.getName().equals("replace")) return;
             }
 
             boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))