diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 7ac0c1ce8a..eaa1cd2d50 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -390,6 +390,9 @@ public class ServiceUI extends IntentService {
                     db.message().deleteMessage(id);
                     message.id = null;
                     message.id = db.message().insertMessage(message);
+                    if (message.content)
+                        EntityMessage.getFile(this, id)
+                                .renameTo(message.getFile(this));
                     db.message().setMessageSnoozed(message.id, null);
                     EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
                 }