diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 6acaed2b15..d0136b9a6c 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1001,9 +1001,10 @@ public class HtmlHelper {
                                 else if (key.endsWith("bottom"))
                                     p[0] = null;
 
-                                if (p[0] != null)
+                                // Both margin and padding can be set
+                                if (p[0] != null && !"true".equals(element.attr("x-line-before")))
                                     element.attr("x-line-before", Boolean.toString(p[0] > 0.5));
-                                if (p[2] != null)
+                                if (p[2] != null && !"true".equals(element.attr("x-line-after")))
                                     element.attr("x-line-after", Boolean.toString(p[2] > 0.5));
                             }
                             break;