diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index dbbb0ff01d..467774b25f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -360,6 +360,9 @@ public class FragmentSetup extends FragmentBase {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.menu_advanced:
+                onMenuAdvanced();
+                return true;
             case R.id.menu_help:
                 onMenuHelp();
                 return true;
@@ -368,6 +371,12 @@ public class FragmentSetup extends FragmentBase {
         }
     }
 
+    private void onMenuAdvanced() {
+        FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.content_frame, new FragmentOptions()).addToBackStack("options");
+        fragmentTransaction.commit();
+    }
+
     private void onMenuHelp() {
         startActivity(getIntentHelp());
     }
diff --git a/app/src/main/res/menu/menu_setup.xml b/app/src/main/res/menu/menu_setup.xml
index e1b343d13f..d534587a2c 100644
--- a/app/src/main/res/menu/menu_setup.xml
+++ b/app/src/main/res/menu/menu_setup.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_advanced"
+        android:icon="@drawable/baseline_settings_applications_24"
+        android:title="@string/title_setup_advanced"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/menu_help"
         android:icon="@drawable/baseline_help_24"