diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index bd6164b0d3cda6e141533fadf900513ac6dfb34a..9afd91a6a23df1ccad3b3df2362ac67ffecc9680 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -431,6 +431,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public void clearReplyReact() {
+        mInReplyTo = null;
         this.payloads.remove(getReactionsEl());
         this.payloads.remove(getReply());
         clearFallbacks("urn:xmpp:reply:0", "urn:xmpp:reactions:0");
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 99f28f20ceb12510143b295ff6f3cb7211f67b73..6ed331af8a96d9c6ad04ebfd927b8f590a90ed8c 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -852,10 +852,12 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                                 replacedMessage.setFileParams(null);
                                 replacedMessage.addPayload(replaceElement);
                             } else {
+                                replacedMessage.clearPayloads();
                                 for (final var p : message.getPayloads()) {
                                     replacedMessage.addPayload(p);
                                 }
                             }
+                            replacedMessage.setInReplyTo(message.getInReplyTo());
                             if (replacedMessage.getServerMsgId() == null || message.getServerMsgId() != null) {
                                 replacedMessage.setServerMsgId(message.getServerMsgId());
                             }