diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index f83fae95ab..dc0450578d 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -802,6 +802,8 @@ public class HtmlHelper {
                 table.tagName("span"); // Links cannot contain tables
             else
                 table.tagName("div");
+        for (Element hf : document.select("thead,tfoot"))
+            hf.tagName("span");
 
         // Remove tracking pixels
         if (disable_tracking)