diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 7c55d92aa8..e813960c01 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -4091,8 +4091,10 @@ public class HtmlHelper {
             start.put(span, ssb.getSpanStart(span));
             end.put(span, ssb.getSpanEnd(span));
             flags.put(span, ssb.getSpanFlags(span));
-            ssb.removeSpan(span);
         }
+
+        ssb.clearSpans();
+
         for (int i = spans.length - 1; i >= 0; i--) {
             int s = start.get(spans[i]);
             int e = end.get(spans[i]);