diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 110302c5e4..b02e8001d8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -187,6 +187,12 @@ public class FragmentFolders extends FragmentBase {
         fabAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                Boolean pop = (Boolean) v.getTag();
+                if (pop != null && pop) {
+                    ToastEx.makeText(v.getContext(), R.string.title_pop_folders, Toast.LENGTH_LONG).show();
+                    return;
+                }
+
                 Bundle args = new Bundle();
                 args.putLong("account", account);
                 FragmentFolder fragment = new FragmentFolder();
@@ -291,10 +297,12 @@ public class FragmentFolders extends FragmentBase {
                     else
                         fabError.hide();
 
-                    if (account == null || !imap || primary)
+                    if (account == null || primary)
                         fabAdd.hide();
-                    else
+                    else {
+                        fabAdd.setTag(!imap);
                         fabAdd.show();
+                    }
                 }
             });
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ee6c0ec573..517d12735d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -758,6 +758,7 @@
     <string name="title_storage_quota">Server storage usage: %1$s/%2$s</string>
     <string name="title_pop_support">The POP3 protocol supports downloading and deleting messages from the inbox only. POP3 cannot mark messages as read, move messages, etc. POP3 will use more battery power and data than IMAP. So, consider using the IMAP protocol whenever possible.</string>
     <string name="title_pop_warning">If a POP3 server does not support the UIDL command, the data usage might be high. So, adjust the poll frequency below accordingly.</string>
+    <string name="title_pop_folders">The POP3 protocol does not support creating folders</string>
     <string name="title_oauth_support">OAuth is not supported</string>
     <string name="title_review">Review</string>
     <string name="title_hint_alias">Long press an identity to display options, like copy to create alias identities</string>