diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 5cdecd51..51e08509 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -132,10 +132,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                     @Override
                     protected Void onLoad(Context context, Bundle args) {
                         DB.getInstance(context).attachment().deleteAttachment(attachment.id);
-                        File dir = new File(context.getFilesDir(), "attachments");
-                        File file = new File(dir, attachment.id.toString());
-                        file.delete();
-
+                        EntityAttachment.getFile(context, attachment.id).delete();
                         return null;
                     }
                 }.load(context, owner, args);
@@ -143,8 +140,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             } else {
                 if (attachment.available) {
                     // Build file name
-                    File dir = new File(context.getFilesDir(), "attachments");
-                    File file = new File(dir, attachment.id.toString());
+                    File file = EntityAttachment.getFile(context, attachment.id);
 
                     // https://developer.android.com/reference/android/support/v4/content/FileProvider
                     Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 12d6b3f6..23588ada 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -19,6 +19,10 @@ package eu.faircode.email;
     Copyright 2018 by Marcel Bokhorst (M66B)
 */
 
+import android.content.Context;
+
+import java.io.File;
+
 import javax.mail.BodyPart;
 
 import androidx.annotation.NonNull;
@@ -60,6 +64,12 @@ public class EntityAttachment {
     @Ignore
     BodyPart part;
 
+    static File getFile(Context context, Long id) {
+        File dir = new File(context.getFilesDir(), "attachments");
+        dir.mkdir();
+        return new File(dir, Long.toString(id));
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EntityAttachment) {
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 93732016..e36b182c 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -108,10 +108,14 @@ public class EntityMessage {
         return sb.toString();
     }
 
-    void write(Context context, String body) throws IOException {
+    static File getFile(Context context, Long id) {
         File dir = new File(context.getFilesDir(), "messages");
         dir.mkdir();
-        File file = new File(dir, id.toString());
+        return new File(dir, id.toString());
+    }
+
+    void write(Context context, String body) throws IOException {
+        File file = getFile(context, id);
         BufferedWriter out = null;
         try {
             out = new BufferedWriter(new FileWriter(file));
@@ -131,8 +135,7 @@ public class EntityMessage {
     }
 
     static String read(Context context, Long id) throws IOException {
-        File dir = new File(context.getFilesDir(), "messages");
-        File file = new File(dir, id.toString());
+        File file = getFile(context, id);
         BufferedReader in = null;
         try {
             in = new BufferedReader(new FileReader(file));
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 3b08dc0f..232579f9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -495,9 +495,7 @@ public class FragmentCompose extends FragmentEx {
                     }
 
                     try {
-                        File dir = new File(context.getFilesDir(), "attachments");
-                        dir.mkdir();
-                        File file = new File(dir, Long.toString(attachment.id));
+                        File file = EntityAttachment.getFile(context, attachment.id);
 
                         InputStream is = null;
                         OutputStream os = null;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index ac340057..05a3d7aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -714,15 +714,11 @@ public class FragmentMessage extends FragmentEx {
                     try {
                         db.beginTransaction();
 
-                        if (debug && BuildConfig.DEBUG)
-                            db.message().deleteMessage(id);
-                        else {
-                            db.message().setMessageUiHide(id, true);
-
-                            EntityMessage message = db.message().getMessage(id);
-                            EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
-                            EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id);
-                        }
+                        db.message().setMessageUiHide(id, true);
+
+                        EntityMessage message = db.message().getMessage(id);
+                        EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
+                        EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id);
 
                         db.setTransactionSuccessful();
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 10155ad7..d6943432 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -129,8 +129,7 @@ public class MessageHelper {
                     BodyPart bpAttachment = new MimeBodyPart();
                     bpAttachment.setFileName(attachment.name);
 
-                    File dir = new File(context.getFilesDir(), "attachments");
-                    File file = new File(dir, attachment.id.toString());
+                    File file = EntityAttachment.getFile(context, attachment.id);
                     FileDataSource dataSource = new FileDataSource(file);
                     dataSource.setFileTypeMap(new FileTypeMap() {
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index a9744f66..0d99343f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1010,9 +1010,7 @@ public class ServiceSynchronize extends LifecycleService {
             EntityAttachment a = helper.getAttachments().get(sequence - 1);
 
             // Build filename
-            File dir = new File(getFilesDir(), "attachments");
-            dir.mkdir();
-            File file = new File(dir, Long.toString(attachment.id));
+            File file = EntityAttachment.getFile(this, attachment.id);
 
             // Download attachment
             InputStream is = null;