diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 1a28f6cd1e..110302c5e4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -291,12 +291,10 @@ public class FragmentFolders extends FragmentBase {
                     else
                         fabError.hide();
 
-                    if (!primary) {
-                        if (account == null || account.protocol != EntityAccount.TYPE_IMAP)
-                            fabAdd.hide();
-                        else
-                            fabAdd.show();
-                    }
+                    if (account == null || !imap || primary)
+                        fabAdd.hide();
+                    else
+                        fabAdd.show();
                 }
             });