diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e21a77dc0f896cf080611eed0931c7853d4da328..f4c49d56fedc00a0478b1490af5a4686c6735623 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1763,6 +1763,10 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void setupReply(Message message) {
+        if (message != null) {
+            final var correcting = conversation.getCorrectingMessage();
+            if (correcting != null && correcting.getUuid().equals(message.getUuid())) return;
+        }
         conversation.setReplyTo(message);
         if (message == null) {
             binding.contextPreview.setVisibility(View.GONE);