diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 07cb867297..bfb53ae0d5 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1117,7 +1117,9 @@ public class HtmlHelper {
 
         // Replace headings
         Elements hs = document.select("h1,h2,h3,h4,h5,h6");
-        hs.attr("x-line-before", "true");
+        for (Element h : hs)
+            if (!"false".equals(h.attr("x-line-before")))
+                h.attr("x-line-before", "true");
         if (text_size) {
             if (text_separators && view)
                 for (Element h : hs)