From 3267741545a33c7a0e1c478de79e839676311ade Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 15 Dec 2020 13:50:07 +0100
Subject: [PATCH] Remove marker attributes

---
 .../main/java/eu/faircode/email/HtmlHelper.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 04fe7d7407..f44a11415f 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -328,8 +328,20 @@ public class HtmlHelper {
 
     static Document sanitizeCompose(Context context, String html, boolean show_images) {
         try {
-            Document parsed = JsoupEx.parse(html);
-            return sanitize(context, parsed, false, show_images);
+            Document d = sanitize(context, JsoupEx.parse(html), false, show_images);
+            d.select("*")
+                    .removeAttr("x-block")
+                    .removeAttr("x-inline")
+                    .removeAttr("x-paragraph")
+                    .removeAttr("x-font-size")
+                    .removeAttr("x-font-size-rel")
+                    .removeAttr("x-line-before")
+                    .removeAttr("x-line-after")
+                    .removeAttr("x-align")
+                    .removeAttr("x-column")
+                    .removeAttr("x-dashed")
+                    .removeAttr("x-tracking");
+            return d;
         } catch (Throwable ex) {
             // OutOfMemoryError
             Log.e(ex);