diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 941d1a521d..1f34f088d7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -333,16 +333,19 @@ public class FragmentQuickSetup extends FragmentBase {
                     folders = iservice.getFolders();
 
                     if (folders.size() == 1 &&
-                            EntityFolder.INBOX.equals(folders.get(0).type)) {
-                        Log.i("Creating system folders");
-                        Store istore = iservice.getStore();
-                        istore.getFolder(EntityFolder.DRAFTS).create(Folder.HOLDS_FOLDERS);
-                        istore.getFolder(EntityFolder.SENT).create(Folder.HOLDS_FOLDERS);
-                        istore.getFolder(EntityFolder.ARCHIVE).create(Folder.HOLDS_FOLDERS);
-                        istore.getFolder(EntityFolder.TRASH).create(Folder.HOLDS_FOLDERS);
-                        istore.getFolder(EntityFolder.JUNK).create(Folder.HOLDS_FOLDERS);
-                        folders = iservice.getFolders();
-                    }
+                            EntityFolder.INBOX.equals(folders.get(0).type))
+                        try {
+                            Log.i("Creating system folders");
+                            Store istore = iservice.getStore();
+                            istore.getFolder(EntityFolder.DRAFTS).create(Folder.HOLDS_FOLDERS);
+                            istore.getFolder(EntityFolder.SENT).create(Folder.HOLDS_FOLDERS);
+                            istore.getFolder(EntityFolder.ARCHIVE).create(Folder.HOLDS_FOLDERS);
+                            istore.getFolder(EntityFolder.TRASH).create(Folder.HOLDS_FOLDERS);
+                            istore.getFolder(EntityFolder.JUNK).create(Folder.HOLDS_FOLDERS);
+                            folders = iservice.getFolders();
+                        } catch (Throwable ex) {
+                            Log.e(ex);
+                        }
                 }
 
                 Long max_size = null;