diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index db5cd1fa9d..10fd7fb401 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1425,7 +1425,7 @@ class Core {
                         folder.type = (EntityFolder.SYSTEM.equals(type) ? type : EntityFolder.USER);
                         folder.synchronize = false;
                         folder.subscribed = subscribed;
-                        folder.poll = account.shouldPoll();
+                        folder.poll = true;
                         folder.sync_days = EntityFolder.DEFAULT_SYNC;
                         folder.keep_days = EntityFolder.DEFAULT_KEEP;
                         folder.selectable = selectable;
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index c309ef85f1..1a04ef237c 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -187,13 +187,6 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return new String[]{name, null};
     }
 
-    boolean shouldPoll() {
-        // Gmail: Too many simultaneous connections
-        // Outlook: User is authenticated but not connected
-        return ("imap.gmail.com".equalsIgnoreCase(host) ||
-                "outlook.office365.com".equalsIgnoreCase(host));
-    }
-
     public JSONObject toJSON() throws JSONException {
         JSONObject json = new JSONObject();
         json.put("id", id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index a64d4f017a..40092ee614 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1155,23 +1155,28 @@ public class FragmentAccount extends FragmentBase {
 
                     if (drafts != null) {
                         drafts.type = EntityFolder.DRAFTS;
+                        drafts.poll = false;
                         folders.add(drafts);
                     }
 
                     if (sent != null) {
                         sent.type = EntityFolder.SENT;
+                        sent.poll = false;
                         folders.add(sent);
                     }
                     if (archive != null) {
                         archive.type = EntityFolder.ARCHIVE;
+                        archive.poll = false;
                         folders.add(archive);
                     }
                     if (trash != null) {
                         trash.type = EntityFolder.TRASH;
+                        trash.poll = false;
                         folders.add(trash);
                     }
                     if (junk != null) {
                         junk.type = EntityFolder.JUNK;
+                        junk.poll = false;
                         folders.add(junk);
                     }