diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index a887b7e716..e8f6cacd59 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -66,6 +66,7 @@ public class FragmentQuickSetup extends FragmentBase {
     private TextView tvCharacters;
     private Button btnCheck;
     private ContentLoadingProgressBar pbCheck;
+    private TextView tvPatience;
 
     private TextView tvError;
     private TextView tvErrorHint;
@@ -102,6 +103,7 @@ public class FragmentQuickSetup extends FragmentBase {
         tvCharacters = view.findViewById(R.id.tvCharacters);
         btnCheck = view.findViewById(R.id.btnCheck);
         pbCheck = view.findViewById(R.id.pbCheck);
+        tvPatience = view.findViewById(R.id.tvPatience);
 
         tvError = view.findViewById(R.id.tvError);
         tvErrorHint = view.findViewById(R.id.tvErrorHint);
@@ -198,6 +200,7 @@ public class FragmentQuickSetup extends FragmentBase {
         tvImapFingerprint.setText(null);
         tvSmtpFingerprint.setText(null);
         pbCheck.setVisibility(View.GONE);
+        tvPatience.setVisibility(View.GONE);
         pbSave.setVisibility(View.GONE);
         btnHelp.setVisibility(View.GONE);
         tvInstructions.setVisibility(View.GONE);
@@ -225,6 +228,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
                 Helper.setViewsEnabled(view, false);
                 pbCheck.setVisibility(check ? View.VISIBLE : View.GONE);
+                tvPatience.setVisibility(check ? View.VISIBLE : View.GONE);
                 pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
                 grpError.setVisibility(View.GONE);
                 btnHelp.setVisibility(View.GONE);
@@ -237,6 +241,7 @@ public class FragmentQuickSetup extends FragmentBase {
             protected void onPostExecute(Bundle args) {
                 Helper.setViewsEnabled(view, true);
                 pbCheck.setVisibility(View.GONE);
+                tvPatience.setVisibility(View.GONE);
                 pbSave.setVisibility(View.GONE);
             }
 
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index b7b2e53b4e..4b7973ca4c 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -131,6 +131,18 @@
             app:layout_constraintStart_toEndOf="@id/btnCheck"
             app:layout_constraintTop_toTopOf="@id/btnCheck" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvPatience"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_quick_patience"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btnCheck" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
@@ -140,7 +152,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnCheck" />
+            app:layout_constraintTop_toBottomOf="@id/tvPatience" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvError"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d1e8fd043..dd48d1a262 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_quick_accounts">Add or change accounts</string>
     <string name="title_setup_quick_support">Some providers make it difficult to add an account. Please do not blame FairEmail for this, but ask for support instead.</string>
     <string name="title_setup_quick_hint">The quick setup will fetch configuration information from autoconfig.thunderbird.net</string>
+    <string name="title_setup_quick_patience">Please be patient &#8230;</string>
     <string name="title_setup_quick_imap">IMAP server to receive messages</string>0
     <string name="title_setup_quick_smtp">SMTP server to send messages</string>0
     <string name="title_setup_wizard">Wizard</string>