diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 3c99544164a0c65437aa3c647ac3d87bc76f816c..9e15b39ff6309ff648266e04ceb89ced94d5505d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1849,6 +1849,9 @@ public class ConversationFragment extends XmppFragment
                                 previousReaction.setReactions(reactions);
                                 activity.xmppConnectionService.updateMessage(previousReaction);
                             }
+                        } else {
+                            message.setInReplyTo(null);
+                            message.clearPayloads();
                         }
                         message.setBody(" ");
                         message.setSubject(null);