diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index db8d93cf4f..8098e697fb 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -592,8 +592,8 @@ public class EntityMessage implements Serializable {
                 try {
                     long id = Long.parseLong(file.getName());
                     File target = getFile(context, id);
-                    if (!file.renameTo(target))
-                        throw new IllegalArgumentException("Failed renaming to " + target);
+                    Helper.copy(file, target);
+                    file.delete();
                 } catch (Throwable ex) {
                     Log.e(ex);
                 }