diff --git a/src/imap/idle.rs b/src/imap/idle.rs
index 920ec3eec..5ae68ca82 100644
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -113,12 +113,13 @@ impl Imap {
         // in this case, we're waiting for a configure job (and an interrupt).
 
         let fake_idle_start_time = SystemTime::now();
-        info!(context, "IMAP-fake-IDLEing...");
 
         // Do not poll, just wait for an interrupt when no folder is passed in.
         if watch_folder.is_none() {
+            info!(context, "IMAP-fake-IDLE: no folder, waiting for interrupt");
             return self.idle_interrupt.recv().await.unwrap_or_default();
         }
+        info!(context, "IMAP-fake-IDLEing folder={:?}", watch_folder);
 
         // check every minute if there are new messages
         // TODO: grow sleep durations / make them more flexible
diff --git a/src/scheduler.rs b/src/scheduler.rs
index 7c0582d59..658712395 100644
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -131,7 +131,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
             // connect and fake idle if unable to connect
             if let Err(err) = connection.connect_configured(&ctx).await {
                 warn!(ctx, "imap connection failed: {}", err);
-                return connection.fake_idle(&ctx, None).await;
+                return connection.fake_idle(&ctx, Some(watch_folder)).await;
             }
 
             // fetch