diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 2371ec456a..98dee4b8c4 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -550,7 +550,8 @@ public class HtmlHelper {
             if (!TextUtils.isEmpty(style)) {
                 boolean block = false;
                 StringBuilder sb = new StringBuilder();
-                if ("span".equals(element.tagName()) &&
+                if (!view &&
+                        "span".equals(element.tagName()) &&
                         "rtl".equals(element.attr("dir")))
                     block = true;
 
@@ -741,7 +742,8 @@ public class HtmlHelper {
                         case "text-align":
                             // https://developer.mozilla.org/en-US/docs/Web/CSS/text-align
                             if (text_align) {
-                                block = true;
+                                if (!element.isBlock())
+                                    block = true;
                                 element.attr("x-align", value);
                                 sb.append(key).append(':').append(value).append(';');
                             }
@@ -749,8 +751,12 @@ public class HtmlHelper {
                     }
                 }
 
-                if (block)
+                if (block) {
                     sb.append("display:block;");
+                    Element next = element.nextElementSibling();
+                    if (next != null && "br".equals(next.tagName()))
+                        next.remove();
+                }
 
                 if (sb.length() == 0)
                     element.removeAttr("style");