diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 6e8cbf24d3..f24c735e95 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -87,6 +87,13 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                 Log.i("UI mode=" + uiMode);
                 if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
                     setTheme(R.style.AppThemeBlack);
+            } else if ("grey_system".equals(theme)) {
+                int uiMode = getResources().getConfiguration().uiMode;
+                Log.i("UI mode=" + uiMode);
+                if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
+                    setTheme(R.style.AppThemeGreyDark);
+                else
+                    setTheme(R.style.AppThemeGreyLight);
             }
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 0f4c396488..4c99241991 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -401,6 +401,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 case "system":
                     rgTheme.check(R.id.rbThemeSystem);
                     break;
+                case "grey_system":
+                    rgTheme.check(R.id.rbThemeGreySystem);
+                    break;
                 default:
                     rgTheme.check(R.id.rbThemeLight);
             }
@@ -429,6 +432,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                         case R.id.rbThemeSystem:
                             prefs.edit().putString("theme", "system").apply();
                             break;
+                        case R.id.rbThemeGreySystem:
+                            prefs.edit().putString("theme", "grey_system").apply();
+                            break;
                     }
                 }
             });
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 953770d503..cdecd3c266 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -1,69 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="12dp">
 
-    <RadioGroup
-        android:id="@+id/rgTheme"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content">
 
-        <RadioButton
-            android:id="@+id/rbThemeLight"
+        <RadioGroup
+            android:id="@+id/rgTheme"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="6dp"
-            android:text="@string/title_setup_light_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            android:orientation="vertical"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <RadioButton
-            android:id="@+id/rbThemeDark"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:padding="6dp"
-            android:text="@string/title_setup_dark_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <RadioButton
+                android:id="@+id/rbThemeLight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/title_setup_light_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <RadioButton
-            android:id="@+id/rbThemeBlack"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:padding="6dp"
-            android:text="@string/title_setup_black_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <RadioButton
+                android:id="@+id/rbThemeDark"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_dark_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <RadioButton
-            android:id="@+id/rbThemeGreyLight"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:padding="6dp"
-            android:text="@string/title_setup_grey_light_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <RadioButton
+                android:id="@+id/rbThemeBlack"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_black_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <RadioButton
-            android:id="@+id/rbThemeGreyDark"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:padding="6dp"
-            android:text="@string/title_setup_grey_dark_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <RadioButton
+                android:id="@+id/rbThemeGreyLight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_grey_light_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <RadioButton
-            android:id="@+id/rbThemeSystem"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:padding="6dp"
-            android:text="@string/title_setup_system_theme"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <RadioButton
+                android:id="@+id/rbThemeGreyDark"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_grey_dark_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+            <RadioButton
+                android:id="@+id/rbThemeSystem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_system_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+            <RadioButton
+                android:id="@+id/rbThemeGreySystem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:padding="6dp"
+                android:text="@string/title_setup_grey_system_theme"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        </RadioGroup>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92b083cc4d..f82a11ef12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -185,6 +185,7 @@
     <string name="title_setup_grey_light_theme">Grey light theme</string>
     <string name="title_setup_grey_dark_theme">Grey dark theme</string>
     <string name="title_setup_system_theme">System theme</string>
+    <string name="title_setup_grey_system_theme">Grey system theme</string>
     <string name="title_setup_advanced">Advanced</string>
 
     <string name="title_setup_options">Options</string>