diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index a5706a8d50..b635c35fa5 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -458,6 +458,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         clearReplyReact();
 
         if (body == null) body = new SpannableStringBuilder(getBody(true));
+        final Element html = getOrMakeHtml();
+        html.clearChildren();
         setBody(QuoteHelper.quote(MessageUtils.prepareQuote(replyTo)) + "\n");
 
         final String replyId = replyTo.replyId();