diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 8545bfc96c..2e0e293633 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -87,9 +87,11 @@ public class HtmlHelper {
 
         // Remove Javascript
         for (Element e : document.select("*"))
-            for (Attribute a : e.attributes())
-                if (a.getValue().trim().toLowerCase().startsWith("javascript:"))
+            for (Attribute a : e.attributes()) {
+                String v = a.getValue();
+                if (v != null && v.trim().toLowerCase().startsWith("javascript:"))
                     e.removeAttr(a.getKey());
+            }
 
         // Remove scripts
         document.select("script").remove();