diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 31ff1c36b9..99d884dc17 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -244,6 +244,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
                         boolean inbox = false;
                         boolean drafts = false;
+                        EntityFolder altDrafts = null;
                         for (Folder ifolder : istore.getDefaultFolder().list("*")) {
                             String fullName = ifolder.getFullName();
                             String[] attrs = ((IMAPFolder) ifolder).getAttributes();
@@ -269,9 +270,16 @@ public class FragmentQuickSetup extends FragmentBase {
                                 }
                                 if (EntityFolder.DRAFTS.equals(type))
                                     drafts = true;
+                                if (folder.name.toLowerCase().contains("draft"))
+                                    altDrafts = folder;
                             }
                         }
 
+                        if (!drafts && altDrafts != null) {
+                            drafts = true;
+                            altDrafts.type = EntityFolder.DRAFTS;
+                        }
+
                         if (!inbox || !drafts)
                             throw new IllegalArgumentException(
                                     context.getString(R.string.title_setup_no_settings, dparts[1]));