diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index c9bde5bca3..6cf292aa88 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -49,6 +49,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;
 
 import com.google.android.material.textfield.TextInputLayout;
@@ -80,6 +81,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
     private TextView tvError;
     private TextView tvErrorHint;
+    private Button btnManual;
     private TextView tvInstructions;
     private Button btnHelp;
     private Button btnSupport;
@@ -148,6 +150,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
         tvError = view.findViewById(R.id.tvError);
         tvErrorHint = view.findViewById(R.id.tvErrorHint);
+        btnManual = view.findViewById(R.id.btnManual);
         tvInstructions = view.findViewById(R.id.tvInstructions);
         btnHelp = view.findViewById(R.id.btnHelp);
         btnSupport = view.findViewById(R.id.btnSupport);
@@ -239,6 +242,18 @@ public class FragmentQuickSetup extends FragmentBase {
             }
         });
 
+        btnManual.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentBase fragment = new FragmentAccount();
+                fragment.setArguments(new Bundle());
+                FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
+                fragmentTransaction.commit();
+                finish();
+            }
+        });
+
         btnSupport.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -256,6 +271,7 @@ public class FragmentQuickSetup extends FragmentBase {
         pbSave.setVisibility(View.GONE);
         tvInstructions.setVisibility(View.GONE);
         tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
+        btnManual.setVisibility(View.GONE);
         btnHelp.setVisibility(View.GONE);
         cbUpdate.setChecked(update);
         cbUpdate.setVisibility(View.GONE);
@@ -294,6 +310,7 @@ public class FragmentQuickSetup extends FragmentBase {
                 pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
                 grpError.setVisibility(View.GONE);
                 tvInstructions.setVisibility(View.GONE);
+                btnManual.setVisibility(View.GONE);
                 btnHelp.setVisibility(View.GONE);
                 cbUpdate.setVisibility(check ? View.GONE : View.VISIBLE);
                 btnSave.setVisibility(check ? View.GONE : View.VISIBLE);
@@ -679,8 +696,10 @@ public class FragmentQuickSetup extends FragmentBase {
                     if (provider != null && provider.appPassword)
                         message += "\n\n" + getString(R.string.title_setup_app_password_hint);
                     tvErrorHint.setText(message);
-                } else
+                } else {
                     tvErrorHint.setText(R.string.title_setup_no_settings_hint);
+                    btnManual.setVisibility(View.VISIBLE);
+                }
 
                 if (ex instanceof IllegalArgumentException || ex instanceof UnknownHostException) {
                     tvError.setText(ex.getMessage());
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 78075d5222..7e99bb65a6 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -189,6 +189,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
+        <Button
+            android:id="@+id/btnManual"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_settings_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_setup_manual_setup"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+
         <TextView
             android:id="@+id/tvErrorRemark"
             android:layout_width="wrap_content"
@@ -199,7 +211,7 @@
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+            app:layout_constraintTop_toBottomOf="@id/btnManual" />
 
         <TextView
             android:id="@+id/tvInstructions"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce78709926..b253b35c0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -283,6 +283,7 @@
     <string name="title_setup_done">Done</string>
     <string name="title_setup_still">Still to do</string>
     <string name="title_setup_error">Error</string>
+    <string name="title_setup_manual_setup">Manual setup</string>
     <string name="title_setup_pop">Use POP3 (not recommended)</string>
     <string name="title_setup_recent">Use \'recent\' for multiple email clients</string>
     <string name="title_setup_configuring">Configuring account &#8230;</string>