Merge branch 'HtmlCleaner_whitelist_backports' into 5.4-MAINT

seb314 · Jan 4, 2018 · 5ba7179 · 5ba7179
2 parents bb8a76c + 3b96982
commit 5ba7179
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java
@@ -14,7 +14,9 @@ public class HtmlSanitizer {
     HtmlSanitizer() {
         Whitelist whitelist = Whitelist.relaxed()
                 .addTags("font", "hr", "ins", "del")
-                .addAttributes("table", "align", "bgcolor", "border", "cellpadding", "cellspacing", "width")
+                .addAttributes("font", "color", "face", "size")
+                .addAttributes("table", "align", "background", "bgcolor", "border", "cellpadding", "cellspacing",
+                        "width")
                 .addAttributes("tr", "align", "bgcolor", "valign")
                 .addAttributes("th",
                         "align", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", "sorted",