diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index fd1665db9a..ff839972bc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -301,8 +301,7 @@ public class FragmentGmail extends FragmentBase {
                     folders = iservice.getFolders();
 
                     if (folders == null)
-                        throw new IllegalArgumentException(
-                                context.getString(R.string.title_setup_no_settings, domain));
+                        throw new IllegalArgumentException(context.getString(R.string.title_setup_no_system_folders));
                 }
 
                 String iprotocol = provider.smtp.starttls ? "smtp" : "smtps";
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 6e29d3bb7c..abdb6c9633 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -262,8 +262,7 @@ public class FragmentQuickSetup extends FragmentBase {
                     folders = iservice.getFolders();
 
                     if (folders == null)
-                        throw new IllegalArgumentException(
-                                context.getString(R.string.title_setup_no_settings, dparts[1]));
+                        throw new IllegalArgumentException(context.getString(R.string.title_setup_no_system_folders));
                 }
 
                 String iprotocol = provider.smtp.starttls ? "smtp" : "smtps";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4f14c873e..d646ef8439 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,6 +145,7 @@
     <string name="title_setup_select_account">Select account</string>
     <string name="title_setup_instructions">Setup instructions</string>
     <string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string>
+    <string name="title_setup_no_system_folders">Inbox or draft folder not found</string>
     <string name="title_setup_quick_success">An account and an identity have successfully been added</string>
     <string name="title_setup_quick_failed">You can try to configure an account and an identity below too</string>
     <string name="title_setup_manage">Manage</string>