diff --git a/Mailnag/daemon/mailnagdaemon.py b/Mailnag/daemon/mailnagdaemon.py
index c2761fa..01b2776 100644
--- a/Mailnag/daemon/mailnagdaemon.py
+++ b/Mailnag/daemon/mailnagdaemon.py
@@ -80,7 +80,7 @@ class MailnagDaemon:
 			accountman = AccountManager(CredentialStore.from_string(self._cfg.get('core', 'credentialstore')))
 			accountman.load_from_cfg(self._cfg, enabled_only = True)
 			self._accounts = accountman.to_list()
-			
+			for a in self._accounts: a.get_imap_folders()
 			self._hookreg = HookRegistry()
 			self._conntest = ConnectivityTest(testmode_mapping[self._cfg.get('core', 'connectivity_test')])
 			
@@ -129,8 +129,8 @@ class MailnagDaemon:
 		if self._accounts != None:
 			for acc in self._accounts:
 				if acc.has_connection():
+					conn = acc.get_connection(use_existing = True)
 					if acc.imap:
-						conn = acc.get_connection(use_existing = True)
 						conn.close()
 						conn.logout()
 					else: