diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index a9045582e300ae959198ed4d730307515d7e2271..5915e5675e31f20dbd27091c9c914a29f5f3ce9d 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -1108,6 +1108,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         }
 
         if (getInReplyTo() != null) {
+            // Don't show quote if it's the message right before us
+            if (prev() != null && prev().getUuid().equals(getInReplyTo().getUuid())) return spannableBody;
+
             final var quote = getInReplyTo().getSpannableBody(thumbnailer, fallbackImg);
             if ((getInReplyTo().isFileOrImage() || getInReplyTo().isOOb()) && getInReplyTo().getFileParams() != null) {
                 quote.insert(0, "🖼️");