diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 66e5fbbc09..76607ff49c 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -293,12 +293,14 @@ public class HtmlHelper {
             }
         }, document);
 
+        // Prevent too many line breaks
+        for (Element div : document.select("div"))
+            if (div.children().size() == div.select("br").size())
+                div.tagName("span");
+
         // Remove block elements displaying nothing
         for (Element e : document.select("*"))
-            if (e.isBlock() &&
-                    !e.hasText() &&
-                    e.select("br").size() == 0 &&
-                    e.select("img").size() == 0)
+            if (e.isBlock() && !e.hasText() && e.select("img").size() == 0)
                 e.remove();
 
         // Prevent too many line breaks