diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index db0953d71a..23aa5515de 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1012,7 +1012,10 @@ public class Helper {
         if (name == null)
             return null;
 
-        return name.replaceAll("[?:\"*|/\\\\<>]", "_");
+        return name
+                // Canonical files names cannot contain NUL
+                .replace("\0", "")
+                .replaceAll("[?:\"*|/\\\\<>]", "_");
     }
 
     static String getExtension(String filename) {