diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 185ef1e063..ed0c19ebc8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -74,6 +74,7 @@ public class FragmentQuickSetup extends FragmentBase {
     private EditText etEmail;
     private TextInputLayout tilPassword;
     private Button btnCheck;
+    private ContentLoadingProgressBar pbCheck;
 
     private TextView tvError;
     private Button btnHelp;
@@ -82,6 +83,8 @@ public class FragmentQuickSetup extends FragmentBase {
     private TextView tvImap;
     private TextView tvSmtp;
     private Button btnSave;
+    private ContentLoadingProgressBar pbSave;
+
     private Group grpSetup;
 
     private static final int REQUEST_DONE = 1;
@@ -100,6 +103,7 @@ public class FragmentQuickSetup extends FragmentBase {
         etEmail = view.findViewById(R.id.etEmail);
         tilPassword = view.findViewById(R.id.tilPassword);
         btnCheck = view.findViewById(R.id.btnCheck);
+        pbCheck = view.findViewById(R.id.pbCheck);
 
         tvError = view.findViewById(R.id.tvError);
         btnHelp = view.findViewById(R.id.btnHelp);
@@ -108,6 +112,8 @@ public class FragmentQuickSetup extends FragmentBase {
         tvImap = view.findViewById(R.id.tvImap);
         tvSmtp = view.findViewById(R.id.tvSmtp);
         btnSave = view.findViewById(R.id.btnSave);
+        pbSave = view.findViewById(R.id.pbSave);
+
         grpSetup = view.findViewById(R.id.grpSetup);
 
         // Wire controls
@@ -147,6 +153,8 @@ public class FragmentQuickSetup extends FragmentBase {
         });
 
         // Initialize
+        pbCheck.setVisibility(View.GONE);
+        pbSave.setVisibility(View.GONE);
         tvError.setVisibility(View.GONE);
         btnHelp.setVisibility(View.GONE);
         tvInstructions.setVisibility(View.GONE);
@@ -200,6 +208,8 @@ public class FragmentQuickSetup extends FragmentBase {
                 boolean check = args.getBoolean("check");
 
                 Helper.setViewsEnabled(view, false);
+                pbCheck.setVisibility(check ? View.VISIBLE : View.GONE);
+                pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
                 tvError.setVisibility(View.GONE);
                 btnHelp.setVisibility(View.GONE);
                 tvInstructions.setVisibility(View.GONE);
@@ -208,7 +218,11 @@ public class FragmentQuickSetup extends FragmentBase {
 
             @Override
             protected void onPostExecute(Bundle args) {
+                boolean check = args.getBoolean("check");
+
                 Helper.setViewsEnabled(view, true);
+                pbCheck.setVisibility(View.GONE);
+                pbSave.setVisibility(View.GONE);
             }
 
             @Override
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 7810190d1b..4db4c6a707 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -86,6 +86,17 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHint" />
 
+            <eu.faircode.email.ContentLoadingProgressBar
+                android:id="@+id/pbCheck"
+                style="@style/Base.Widget.AppCompat.ProgressBar"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="12dp"
+                android:indeterminate="true"
+                app:layout_constraintBottom_toBottomOf="@id/btnCheck"
+                app:layout_constraintStart_toEndOf="@id/btnCheck"
+                app:layout_constraintTop_toTopOf="@id/btnCheck" />
+
             <TextView
                 android:id="@+id/tvError"
                 android:layout_width="wrap_content"
@@ -171,6 +182,17 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
 
+            <eu.faircode.email.ContentLoadingProgressBar
+                android:id="@+id/pbSave"
+                style="@style/Base.Widget.AppCompat.ProgressBar"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="12dp"
+                android:indeterminate="true"
+                app:layout_constraintBottom_toBottomOf="@id/btnSave"
+                app:layout_constraintStart_toEndOf="@id/btnSave"
+                app:layout_constraintTop_toTopOf="@id/btnSave" />
+
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpSetup"
                 android:layout_width="0dp"