diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 6b236503a9..431c36d477 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -71,6 +71,7 @@ public class FragmentSetup extends FragmentBase {
 
     private Button btnData;
 
+    private Button btnOptions;
     private Button btnInbox;
 
     private int textColorPrimary;
@@ -111,6 +112,7 @@ public class FragmentSetup extends FragmentBase {
 
         btnData = view.findViewById(R.id.btnData);
 
+        btnOptions = view.findViewById(R.id.btnOptions);
         btnInbox = view.findViewById(R.id.btnInbox);
 
         // Wire controls
@@ -183,6 +185,15 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
+        btnOptions.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.content_frame, new FragmentOptions()).addToBackStack("options");
+                fragmentTransaction.commit();
+            }
+        });
+
         btnInbox.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 5689422f04..8b3cfa4a8c 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -369,6 +369,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/five" />
 
+        <Button
+            android:id="@+id/btnOptions"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_setup_options"
+            app:layout_constraintBottom_toBottomOf="@+id/btnInbox"
+            app:layout_constraintStart_toStartOf="parent" />
+
         <Button
             android:id="@+id/btnInbox"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b5c5b0daf..8152ddd824 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -130,6 +130,7 @@
     <string name="title_setup_black_theme">Black theme</string>
     <string name="title_setup_system_theme">System theme</string>
     <string name="title_setup_defaults">Restore defaults</string>
+    <string name="title_setup_options">Options</string>
 
     <string name="title_advanced">Advanced options</string>