diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index 19ab317e9e..c13f95724e 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -36,8 +36,9 @@ public interface DaoIdentity {
 
     @Query("SELECT identity.*, account.name AS accountName FROM identity" +
             " JOIN account ON account.id = identity.account" +
+            " JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" +
             " WHERE NOT :synchronize OR account.synchronize")
-    List<TupleIdentityEx> getIdentities(boolean synchronize);
+    List<TupleIdentityEx> getComposableIdentities(boolean synchronize);
 
     @Query("SELECT * FROM identity WHERE account = :account")
     List<EntityIdentity> getIdentities(long account);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 049083c263..6776b1a3af 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1384,7 +1384,7 @@ public class FragmentCompose extends FragmentBase {
                     if ("edit".equals(action))
                         throw new IllegalStateException("Draft not found hide=" + (result.draft != null));
 
-                    List<TupleIdentityEx> identities = db.identity().getIdentities(true);
+                    List<TupleIdentityEx> identities = db.identity().getComposableIdentities(true);
 
                     EntityMessage ref = db.message().getMessage(reference);
                     if (ref == null) {
@@ -1649,7 +1649,7 @@ public class FragmentCompose extends FragmentBase {
                 @Override
                 protected List<TupleIdentityEx> onExecute(Context context, Bundle args) {
                     DB db = DB.getInstance(context);
-                    List<TupleIdentityEx> identities = db.identity().getIdentities(true);
+                    List<TupleIdentityEx> identities = db.identity().getComposableIdentities(true);
                     if (identities == null)
                         identities = new ArrayList<>();