diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.cpp
index d6c98c4a4e..6b1c5e56d8 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.cpp
@@ -111,11 +111,7 @@ IMAPProtocol::CheckSubscribedFolders(IMAP::Protocol& protocol, bool idle)
 	}
 
 	// Start waiting workers
-	for (int32 i = 0; i < fWorkers.CountItems(); i++) {
-		fWorkers.ItemAt(i)->EnqueueCheckMailboxes();
-	}
-
-	return B_OK;
+	return _EnqueueCheckMailboxes();
 }
 
 
@@ -154,7 +150,7 @@ IMAPProtocol::SyncMessages()
 		return worker->Run();
 	}
 
-	return B_OK;
+	return _EnqueueCheckMailboxes();
 }
 
 
@@ -244,6 +240,17 @@ IMAPProtocol::_CreateFolder(const BString& mailbox, const BString& separator)
 }
 
 
+status_t
+IMAPProtocol::_EnqueueCheckMailboxes()
+{
+	for (int32 i = 0; i < fWorkers.CountItems(); i++) {
+		fWorkers.ItemAt(i)->EnqueueCheckMailboxes();
+	}
+
+	return B_OK;
+}
+
+
 // #pragma mark -
 
 
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.h b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.h
index 71eed42fe7..c3c43a339e 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.h
@@ -52,6 +52,7 @@ protected:
 private:
 			IMAPFolder*			_CreateFolder(const BString& mailbox,
 									const BString& separator);
+			status_t			_EnqueueCheckMailboxes();
 
 protected:
 			Settings			fSettings;