diff --git a/app/build.gradle b/app/build.gradle
index 51c2b853e7..5d78503ded 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -299,7 +299,7 @@ android {
             minSdkVersion 23
             manifestPlaceholders.largeHeap = false
             manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("play" + getVersionCode() + getRevision()).getBytes()).toString();
-            buildConfigField "boolean", "TEST_RELEASE", "false"
+            buildConfigField "boolean", "TEST_RELEASE", "true"
             buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "true"
             buildConfigField "boolean", "FDROID_RELEASE", "false"
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index f4c0d40b77..2b9e78d044 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1471,6 +1471,16 @@ public class FragmentAccount extends FragmentBase {
                     for (EntityFolder folder : folders) {
                         Log.i("Checking folder=" + folder.name + ":" + folder.type);
                         EntityFolder existing = current.get(folder.name);
+                        EntityFolder indb = db.folder().getFolderByName(account.id, folder.name);
+                        if (existing == null && indb != null) {
+                            existing = indb;
+                            for (EntityFolder f : current.values())
+                                Log.breadcrumb("Debug", "From db", f.name + ":" + f.type);
+                            for (EntityFolder f : folders)
+                                Log.breadcrumb("Debug", "From config", f.name + ":" + f.type);
+                            Log.e("Exists in db folder=" + indb.name + ":" + indb.type +
+                                    " not exists folder=" + folder.name + ":" + folder.type);
+                        }
                         if (existing == null) {
                             folder.id = null;
                             folder.account = account.id;