diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 229602ffc22a16221b93d61d1f74cd800a5154d5..f475da74382754662546c5a5ce357ea0e5ef49dc 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -259,7 +259,9 @@ public class UIHelper {
                 for (final android.text.style.QuoteSpan quote : Lists.reverse(Lists.newArrayList(styledBody.getSpans(0, styledBody.length(), android.text.style.QuoteSpan.class)))) {
                     int start = styledBody.getSpanStart(quote);
                     int end = styledBody.getSpanEnd(quote);
+                    if (start == 0 && end == styledBody.length()) continue;
                     styledBody.delete(start, end);
+                    styledBody.removeSpan(quote);
                 }
                 if (!processMarkup) return new Pair<>(styledBody, false);