diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 939c2c5708..cbde79e8fe 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -134,7 +134,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             }
 
             if (folder.sync_state == null || "requested".equals(folder.sync_state)) {
-                if ("connected".equals(folder.state))
+                if ("waiting".equals(folder.state))
+                    ivState.setImageResource(R.drawable.baseline_hourglass_empty_24);
+                else if ("connected".equals(folder.state))
                     ivState.setImageResource(R.drawable.baseline_cloud_24);
                 else if ("connecting".equals(folder.state))
                     ivState.setImageResource(R.drawable.baseline_cloud_queue_24);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 9000f53428..a12cadb1fe 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1243,7 +1243,10 @@ public class ServiceSynchronize extends LifecycleService {
                                                                     Log.w(folder.name, ex);
                                                                 }
                                                             }
-                                                            db.folder().setFolderState(folder.id, null);
+                                                            if (folder.synchronize && (folder.poll || !capIdle))
+                                                                db.folder().setFolderState(folder.id, "waiting");
+                                                            else
+                                                                db.folder().setFolderState(folder.id, null);
                                                         }
                                                     }
                                                 } finally {