diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 46d1289667..522b1b92a6 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -173,6 +173,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                     setTheme(R.style.AppThemeBlack);
                     break;
 
+                case "black_and_white":
+                    setTheme(R.style.AppThemeBlackAndWhite);
+                    break;
+
                 // System
                 case "system":
                 case "blue_orange_system":
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index c9c1f54794..76ea287491 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -1061,6 +1061,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 case "black":
                     rgTheme.check(R.id.rbThemeBlack);
                     break;
+                case "black_and_white":
+                    rgTheme.check(R.id.rbThemeBlackAndWhite);
+                    break;
             }
 
             return new AlertDialog.Builder(getContext())
@@ -1115,6 +1118,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                                 case R.id.rbThemeBlack:
                                     prefs.edit().putString("theme", "black").apply();
                                     break;
+                                case R.id.rbThemeBlackAndWhite:
+                                    prefs.edit().putString("theme", "black_and_white").apply();
+                                    break;
                             }
                         }
                     })
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 0285911f18..c3da60b333 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -79,6 +79,14 @@
                 android:padding="6dp"
                 android:text="@string/title_setup_theme_black"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+            <RadioButton
+                android:id="@+id/rbThemeBlackAndWhite"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/title_setup_theme_black_and_white"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </RadioGroup>
 
         <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8880a98ea5..e8a292d4b2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -119,6 +119,11 @@
     <color name="blackPrimaryDark">#1b1b1b</color>
     <color name="blackAccent">#ff8f00</color>
 
+    <!-- Grey 900 -->
+    <color name="blackAndWhitePrimary">#212121</color>
+    <color name="blackAndWhitePrimaryDark">#000000</color>
+    <color name="blackAndWhitePrimaryLight">#484848</color>
+
     <!-- Grey 800 / Blue grey 300 -->
     <color name="greyPrimary">#424242</color>
     <color name="greyPrimaryDark">#1b1b1b</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb3199e25d..b15cfdb942 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -241,6 +241,7 @@
     <string name="title_setup_theme_red_green">Red/green</string>
     <string name="title_setup_theme_grey">Grey</string>
     <string name="title_setup_theme_black">Black</string>
+    <string name="title_setup_theme_black_and_white">Black and white</string>
 
     <string name="title_setup_theme_reverse">Swap colors</string>
     <string name="title_setup_theme_dark">Dark</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2a0f5202a6..8b7a2627b6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -346,6 +346,27 @@
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
+    <style name="AppThemeBlackAndWhite" parent="AppThemeBlack">
+        <item name="colorPrimary">@color/blackAndWhitePrimary</item>
+        <item name="colorPrimaryDark">@color/blackAndWhitePrimaryDark</item>
+        <item name="colorAccent">@color/white</item>
+
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/white</item>
+        <item name="android:textColorTertiary">@color/white</item>
+        <item name="android:textColorPrimaryInverse">@color/black</item>
+        <item name="android:textColorSecondaryInverse">@color/black</item>
+        <item name="android:textColorTertiaryInverse">@color/black</item>
+        <item name="android:textColorLink">@color/lightBluePrimary</item>
+
+        <item name="colorRead">@color/white</item>
+        <item name="colorUnread">@color/white</item>
+        <item name="colorUnreadHighlight">@color/white</item>
+
+        <item name="colorFabBackground">@color/blackAndWhitePrimaryLight</item>
+    </style>
+
     <style name="AppThemeGreySteelBlueLight" parent="AppThemeBaseLight">
         <item name="colorPrimary">@color/greyPrimary</item>
         <item name="colorPrimaryDark">@color/greyPrimaryDark</item>