diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 0b04d15c40..89658d2b2b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -231,8 +231,6 @@ public class FragmentFolder extends FragmentBase {
 
                 boolean should = args.getBoolean("should");
 
-                if (TextUtils.isEmpty(display) || display.equals(name))
-                    display = null;
                 int sync_days = (TextUtils.isEmpty(sync) ? EntityFolder.DEFAULT_SYNC : Integer.parseInt(sync));
                 int keep_days = (TextUtils.isEmpty(keep) ? EntityFolder.DEFAULT_KEEP : Integer.parseInt(keep));
                 if (keep_days < sync_days)
@@ -275,6 +273,9 @@ public class FragmentFolder extends FragmentBase {
                         return false;
                     }
 
+                    if (TextUtils.isEmpty(display) || display.equals(name))
+                        display = null;
+
                     if (folder == null) {
                         reload = true;
                         Log.i("Creating folder=" + name + " parent=" + parent);