diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt
index 9c009648a9b086e3ef299a5943f042f7f8343363..9034f4d2ca067758ab197322a84819eca78c74e2 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt
@@ -6,7 +6,6 @@ class DisplayHtml(private val settings: HtmlSettings) : HtmlHeadProvider {
     override val headHtml: String
         get() {
             return """<meta name="viewport" content="width=device-width"/>""" +
-                cssStyleTheme() +
                 cssStylePre() +
                 cssStyleSignature()
         }
@@ -18,7 +17,6 @@ class DisplayHtml(private val settings: HtmlSettings) : HtmlHeadProvider {
     fun wrapMessageContent(messageContent: CharSequence): String {
         // Include a meta tag so the WebView will not use a fixed viewport width of 980 px
         return "<html dir=\"auto\"><head><meta name=\"viewport\" content=\"width=device-width\"/>" +
-            cssStyleTheme() +
             cssStylePre() +
             "</head><body>" +
             messageContent +
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index abd4094b014c3ca656327f0c615f738d49b4844e..98833ebb6b18afe1095eb7812606df801f377290 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -26,6 +26,7 @@
     <style name="Theme.K9.Common" parent="Theme.K9.Base">
         <item name="android:windowBackground">@color/color_default_background</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="isLightTheme">@bool/isLightMode</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">@bool/isLightMode</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">@bool/isLightMode</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle
index f9957cde9b7d471ea1d57373fddd68088b27b1ee..e7141371789c203da10366d7d1a8a0ca6283bbd6 100644
--- a/app/ui/legacy/build.gradle
+++ b/app/ui/legacy/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     implementation libs.retrofit.converter.simplexml
     implementation libs.fullscreenloadingdialog
     implementation libs.yetanotheraccountchip
+    implementation libs.webkit
 
     annotationProcessor libs.glide.compiler
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
index fde796689ff6f096de00cd1ecb29376253de97c9..0d15230867ba15aecadadf04e3c9c1a7fc1af725 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
@@ -6,6 +6,8 @@ import android.util.AttributeSet
 import android.webkit.WebSettings.LayoutAlgorithm
 import android.webkit.WebSettings.RenderPriority
 import android.webkit.WebView
+import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebViewFeature
 import com.fsck.k9.mailstore.AttachmentResolver
 import timber.log.Timber
 
@@ -58,6 +60,19 @@ class MessageWebView : WebView {
 
         // Disable network images by default. This is overridden by preferences.
         blockNetworkData(true)
+
+        setUpTheme(config.useDarkMode)
+    }
+
+    private fun setUpTheme(useDarkMode: Boolean) {
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) {
+            WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, true)
+        }
+
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+            val forceDarkMode = if (useDarkMode) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF
+            WebSettingsCompat.setForceDark(settings, forceDarkMode)
+        }
     }
 
     private fun disableDisplayZoomControls() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d85ac29371bd18d483d81800b4999018ffe163db..123d4e8720dc8be00e68ba8fbb327ebe0abffdf6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -114,6 +114,7 @@ retrofit-converter-simplexml = "com.squareup.retrofit2:converter-simplexml:2.9.0
 fullscreenloadingdialog = "com.github.fahim44:FullScreenLoadingDialog:1.0.7"
 elib = "foundation.e:elib:0.0.1-alpha11"
 yetanotheraccountchip = "com.github.fahim44:YetAnotherAccountChip:1.0.0"
+webkit = "androidx.webkit:webkit:1.6.0"
 
 junit = "junit:junit:4.13.2"
 robolectric = "org.robolectric:robolectric:4.9.2"
