diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index bb6eb6f07c..43f2eaee72 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -257,7 +257,7 @@ public class WorkerCleanup extends Worker {
             if (images != null)
                 for (File file : images)
                     if (manual || file.lastModified() + KEEP_FILES_DURATION < now) {
-                        long id = Long.parseLong(file.getName().split("_")[0]);
+                        long id = Long.parseLong(file.getName().split("[_\\.]")[0]);
                         EntityMessage message = db.message().getMessage(id);
                         if (manual || message == null ||
                                 file.lastModified() + KEEP_IMAGES_DURATION < now) {