diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8dfcb707d2..78f69326d1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3507,7 +3507,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                                 // Write decrypted body
                                 EntityMessage m = db.message().getMessage(id);
-                                Helper.writeText(m.getFile(context), decrypted.toString());
+                                Helper.writeText(m.getFile(context), decrypted.toString().replace("\0", ""));
 
                                 db.message().setMessageStored(id, new Date().getTime());