diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 3a66c4e314..2a112525e6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -346,9 +346,13 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
 
                 order = getMenuItems(menu, context, providers, order, true, debug);
 
-                SpannableString ss = new SpannableString(getString(R.string.title_setup_pop3));
-                ss.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), 0, ss.length(), 0);
-                menu.add(Menu.FIRST, R.string.title_setup_pop3, order++, ss);
+                SpannableString imap = new SpannableString(getString(R.string.title_setup_imap));
+                imap.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), 0, imap.length(), 0);
+                menu.add(Menu.FIRST, R.string.title_setup_imap, order++, imap);
+
+                SpannableString pop3 = new SpannableString(getString(R.string.title_setup_pop3));
+                pop3.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), 0, pop3.length(), 0);
+                menu.add(Menu.FIRST, R.string.title_setup_pop3, order++, pop3);
 
                 popupMenu.insertIcons(context);
 
@@ -381,7 +385,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
                             lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP)
                                     .putExtra("title", itemId));
                             return true;
-                        } else if (itemId == R.string.title_setup_classic) {
+                        } else if (itemId == R.string.title_setup_imap) {
                             ibManual.setPressed(true);
                             ibManual.setPressed(false);
                             manual = true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f82677cc81..2168ae0c33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -230,6 +230,7 @@
     <string name="title_setup_google_sign_in">Sign in with Google</string>
     <string name="title_setup_other">Other provider</string>
     <string name="title_setup_inbound">Incoming email only (email cannot be sent!)</string>
+    <string name="title_setup_imap">IMAP account</string>
     <string name="title_setup_pop3">POP3 account</string>
     <string name="title_setup_oauth_permission">The email provider has approved OAuth only for the Play Store and GitHub version</string>
     <string name="title_setup_gmail_support">Authorizing Google accounts will work in the Play Store and GitHub version only because Android checks the digital app signature</string>