diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 696e315da9..545ba2c33e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -953,6 +953,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                             db.folder().setFolderState(folder.id, "connecting");
 
                             final IMAPFolder ifolder = (IMAPFolder) iservice.getStore().getFolder(folder.name);
+                            mapFolders.put(folder, ifolder);
                             try {
                                 if (BuildConfig.DEBUG && "Postausgang".equals(folder.name))
                                     throw new ReadOnlyFolderException(ifolder);
@@ -975,7 +976,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                 db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
                                 throw ex;
                             }
-                            mapFolders.put(folder, ifolder);
 
                             db.folder().setFolderState(folder.id, "connected");
                             db.folder().setFolderError(folder.id, null);