diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 815e9014ac..21cb29f7f5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -69,6 +69,7 @@ public class FragmentAccount extends Fragment {
     private CheckBox cbSynchronize;
     private Button btnOk;
     private ProgressBar pbCheck;
+    // TODO: loading spinner
 
     static final int DEFAULT_INBOX_SYNC = 30;
     static final int DEFAULT_STANDARD_SYNC = 7;
@@ -296,7 +297,7 @@ public class FragmentAccount extends Fragment {
                     folders.add(0, inbox);
 
                     for (EntityFolder folder : folders)
-                        if (db.folder().getFolder(account.id, folder.name) == null) {
+                        if (db.folder().getFolderByName(account.id, folder.name) == null) {
                             folder.account = account.id;
                             Log.i(Helper.TAG, "Creating folder=" + folder.name + " (" + folder.type + ")");
                             folder.id = db.folder().insertFolder(folder);
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 205cab186c..561a6165c4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.Group;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.AsyncTaskLoader;
@@ -37,12 +38,15 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 public class FragmentFolder extends Fragment {
     private CheckBox cbSynchronize;
     private EditText etAfter;
     private Button btnOk;
+    private ProgressBar pbWait;
+    private Group grpReady;
 
     @Override
     @Nullable
@@ -57,6 +61,8 @@ public class FragmentFolder extends Fragment {
         cbSynchronize = view.findViewById(R.id.cbSynchronize);
         etAfter = view.findViewById(R.id.etAfter);
         btnOk = view.findViewById(R.id.btnOk);
+        pbWait = view.findViewById(R.id.pbWait);
+        grpReady = view.findViewById(R.id.grpReady);
 
         btnOk.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -72,6 +78,11 @@ public class FragmentFolder extends Fragment {
             }
         });
 
+        // Initialize
+        grpReady.setVisibility(View.GONE);
+        pbWait.setVisibility(View.VISIBLE);
+
+        // Observe
         DB.getInstance(getContext()).folder().liveFolder(id).observe(this, new Observer<EntityFolder>() {
             @Override
             public void onChanged(@Nullable EntityFolder folder) {
@@ -79,6 +90,9 @@ public class FragmentFolder extends Fragment {
                     cbSynchronize.setChecked(folder.synchronize);
                     etAfter.setText(Integer.toString(folder.after));
                 }
+
+                pbWait.setVisibility(View.GONE);
+                grpReady.setVisibility(View.VISIBLE);
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index a5ed0d714d..a82eda57eb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -70,6 +70,7 @@ public class FragmentIdentity extends Fragment {
     private CheckBox cbSynchronize;
     private Button btnOk;
     private ProgressBar pbCheck;
+    // TODO: loading spinner
 
     @Override
     @Nullable
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 523dc47789..408ab6885c 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fillViewport="true"
     android:orientation="vertical"
     tools:context=".ActivityView">
 
@@ -52,10 +53,21 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etAfter" />
 
+        <ProgressBar
+            android:id="@+id/pbWait"
+            style="@style/Base.Widget.AppCompat.ProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <android.support.constraint.Group
             android:id="@+id/grpReady"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="cbSynchronize,etAfter,btnOk" />
+            app:constraint_referenced_ids="cbSynchronize,tvAfter,etAfter,btnOk" />
     </android.support.constraint.ConstraintLayout>
 </ScrollView>
\ No newline at end of file