diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index ce23e4cbb9..1555f23d9d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -32,7 +32,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.ContactsContract;
 import android.text.TextUtils;
-import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -364,9 +363,12 @@ public class FragmentGmail extends FragmentBase {
 
                     // Create folders
                     for (EntityFolder folder : folders) {
-                        folder.account = account.id;
-                        folder.id = db.folder().insertFolder(folder);
-                        EntityLog.log(context, "Gmail folder=" + folder.name + " type=" + folder.type);
+                        EntityFolder existing = db.folder().getFolderByName(account.id, folder.name);
+                        if (existing == null) {
+                            folder.account = account.id;
+                            folder.id = db.folder().insertFolder(folder);
+                            EntityLog.log(context, "Gmail folder=" + folder.name + " type=" + folder.type);
+                        }
                     }
 
                     // Set swipe left/right folder
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 50ff412102..a501c75f79 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -28,7 +28,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Pair;
-import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -527,9 +526,12 @@ public class FragmentOAuth extends FragmentBase {
 
                     // Create folders
                     for (EntityFolder folder : folders) {
-                        folder.account = account.id;
-                        folder.id = db.folder().insertFolder(folder);
-                        EntityLog.log(context, "OAuth folder=" + folder.name + " type=" + folder.type);
+                        EntityFolder existing = db.folder().getFolderByName(account.id, folder.name);
+                        if (existing == null) {
+                            folder.account = account.id;
+                            folder.id = db.folder().insertFolder(folder);
+                            EntityLog.log(context, "OAuth folder=" + folder.name + " type=" + folder.type);
+                        }
                     }
 
                     // Set swipe left/right folder
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 508057ab3f..324427f833 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -28,7 +28,6 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
-import android.util.Patterns;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -355,9 +354,12 @@ public class FragmentQuickSetup extends FragmentBase {
 
                     // Create folders
                     for (EntityFolder folder : folders) {
-                        folder.account = account.id;
-                        folder.id = db.folder().insertFolder(folder);
-                        EntityLog.log(context, "Quick added folder=" + folder.name + " type=" + folder.type);
+                        EntityFolder existing = db.folder().getFolderByName(account.id, folder.name);
+                        if (existing == null) {
+                            folder.account = account.id;
+                            folder.id = db.folder().insertFolder(folder);
+                            EntityLog.log(context, "Quick added folder=" + folder.name + " type=" + folder.type);
+                        }
                     }
 
                     // Set swipe left/right folder