diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 0a6152fc52..a13c633c99 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -3876,18 +3876,25 @@ public class HtmlHelper {
             int s = start.get(spans[i]);
             int e = end.get(spans[i]);
             int f = flags.get(spans[i]);
+            boolean changed = false;
             if (spans[i] instanceof AlignmentSpan ||
                     spans[i] instanceof BulletSpan ||
                     spans[i] instanceof NumberSpan) {
                 if (spans[i] instanceof AlignmentSpan &&
                         !(e > 0 && ssb.charAt(e - 1) == '\n') &&
-                        e < ssb.length() && ssb.charAt(e) == '\n')
+                        e < ssb.length() && ssb.charAt(e) == '\n') {
                     e++;
-                if (s > 0 && ssb.charAt(s - 1) == '\n' &&
-                        e > 0 && ssb.charAt(e - 1) == '\n')
+                    changed = true;
+                }
+                if ((f & Spanned.SPAN_PARAGRAPH) == 0 &&
+                        s > 0 && ssb.charAt(s - 1) == '\n' &&
+                        e > 0 && ssb.charAt(e - 1) == '\n') {
                     f |= Spanned.SPAN_PARAGRAPH;
+                    changed = true;
+                }
             }
-            ssb.setSpan(spans[i], s, e, f);
+            if (changed)
+                ssb.setSpan(spans[i], s, e, f);
         }
 
         for (Object bold : spans) {