diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22d6f0845e..3e92627371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ### [Yaverlandia](https://en.wikipedia.org/wiki/Yaverlandia)
 
+### Next version
+
+* Added theme option for default light original message view
+
 ### 1.1731
 
 * Fixed invalid error reports
diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
index 22d6f0845e..3e92627371 100644
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ### [Yaverlandia](https://en.wikipedia.org/wiki/Yaverlandia)
 
+### Next version
+
+* Added theme option for default light original message view
+
 ### 1.1731
 
 * Fixed invalid error reports
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4081dc6906..081883b430 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2268,6 +2268,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 properties.setValue("full", message.id, true);
                 properties.setValue("full_asked", message.id, true);
             }
+
+            boolean default_light = prefs.getBoolean("default_light", false);
+            properties.setValue("force_light", message.id, default_light);
         }
 
         private void bindBody(TupleMessageEx message, final boolean scroll) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
index f246a3dd47..a81e313e12 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
@@ -24,6 +24,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
     private SwitchCompat swReverse;
     private RadioGroup rgThemeOptions;
     private SwitchCompat swBlack;
+    private SwitchCompat swHtmlLight;
     private TextView tvSystem;
     private TextView tvMore;
 
@@ -45,6 +46,8 @@ public class FragmentDialogTheme extends FragmentDialogBase {
 
         swBlack.setEnabled(colored && !grey && !solarized && optionId != R.id.rbThemeLight);
 
+        swHtmlLight.setEnabled(!colored || optionId != R.id.rbThemeLight);
+
         tvSystem.setEnabled(colored && optionId == R.id.rbThemeSystem);
     }
 
@@ -56,6 +59,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
         swReverse = dview.findViewById(R.id.swReverse);
         rgThemeOptions = dview.findViewById(R.id.rgThemeOptions);
         swBlack = dview.findViewById(R.id.swBlack);
+        swHtmlLight = dview.findViewById(R.id.swHtmlLight);
         tvSystem = dview.findViewById(R.id.tvSystem);
         tvMore = dview.findViewById(R.id.tvMore);
 
@@ -109,6 +113,9 @@ public class FragmentDialogTheme extends FragmentDialogBase {
 
         swBlack.setChecked(black);
 
+        boolean default_light = prefs.getBoolean("default_light", false);
+        swHtmlLight.setChecked(default_light);
+
         switch (theme) {
             case "light":
             case "dark":
@@ -244,6 +251,8 @@ public class FragmentDialogTheme extends FragmentDialogBase {
                             editor.putString("theme", "black_and_white").apply();
                         }
 
+                        editor.putBoolean("default_light", swHtmlLight.isChecked());
+
                         editor.apply();
                     }
                 })
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 7ae796828c..e5b12b1ec6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -144,7 +144,8 @@ public class FragmentOptions extends FragmentBase {
             "language_detection",
             "quick_filter", "quick_scroll",
             "experiments", "debug",
-            "biometrics"
+            "biometrics",
+            "default_light"
     };
 
     @Override
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 91c145ef58..256021fe45 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -93,7 +93,7 @@
             android:id="@+id/swReverse"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:text="@string/title_setup_theme_reverse"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -103,7 +103,7 @@
             android:id="@+id/rgThemeOptions"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -149,12 +149,22 @@
             android:id="@+id/swBlack"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:text="@string/title_setup_theme_black_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSystem" />
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swHtmlLight"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_theme_html_light"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swBlack" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvMore"
             android:layout_width="wrap_content"
@@ -164,6 +174,6 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swBlack" />
+            app:layout_constraintTop_toBottomOf="@id/swHtmlLight" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 68185ca0e3..3d614d2f0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -292,6 +292,7 @@
     <string name="title_setup_theme_dark">Dark</string>
     <string name="title_setup_theme_system">Follow system</string>
     <string name="title_setup_theme_black_background">Black background</string>
+    <string name="title_setup_theme_html_light">Light background for original message view</string>
 
     <string name="title_setup_theme_system_hint">This will automatically switch to a light/dark theme on day/night mode, if supported by Android</string>
     <string name="title_setup_theme_more_colors">I want more colors</string>