diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f76131d51a..093e0f0f5f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1292,7 +1292,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                     List<EntityFolder> folders = db.folder().getFolders(message.account);
                     List<EntityFolder> targets = new ArrayList<>();
                     for (EntityFolder f : folders)
-                        if (!f.id.equals(message.folder) && !EntityFolder.DRAFTS.equals(f.type))
+                        if (!f.id.equals(message.folder))
                             targets.add(f);
 
                     EntityFolder.sort(targets);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cc10258b38..4d651f657f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -696,9 +696,8 @@ public class FragmentMessages extends FragmentEx {
 
                         List<EntityFolder> targets = new ArrayList<>();
                         for (EntityFolder folder : folders)
-                            if (!EntityFolder.DRAFTS.equals(folder.type))
-                                if (fid < 0 ? !folder.unified : !folder.id.equals(fid))
-                                    targets.add(folder);
+                            if (fid < 0 ? !folder.unified : !folder.id.equals(fid))
+                                targets.add(folder);
 
                         EntityFolder.sort(targets);