diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 3ed2dcdd25..751c0dc351 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1331,13 +1331,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                 public void run() {
                                     try {
                                         Log.i(folder.name + " start idle");
-                                        while (state.isRunning() && state.isRecoverable()) {
+                                        while (ifolder.isOpen() && state.isRunning() && state.isRecoverable()) {
                                             Log.i(folder.name + " do idle");
                                             ifolder.idle(false);
                                             state.activity();
                                         }
-                                        if (BuildConfig.DEBUG)
-                                            EntityLog.log(ServiceSynchronize.this, folder.name + " end IDLE");
                                     } catch (Throwable ex) {
                                         Log.e(folder.name, ex);
                                         EntityLog.log(