diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7baf79a6b9..8ca592ca50 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -477,9 +477,7 @@ public class Helper {
     static String sanitizeFilename(String name) {
         if (name == null)
             return null;
-        return name
-                .replace("\0", "_")
-                .replace("/", "_");
+        return name.replaceAll("[?:\"*|/\\\\<>]", "_");
     }
 
     static String getExtension(String filename) {