diff --git a/FAQ.md b/FAQ.md
index 545c51a0c7..e3e5c5cf50 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2937,9 +2937,9 @@ You'll likely want to disabled [browse on server](#user-content-faq24) too.
 
 The original message view will use a dark background when using a dark theme for Android version 10 and later.
 
-For Android before version 10 Google removed this feature from the [Android System WebView](https://play.google.com/store/apps/details?id=com.google.android.webview),
-even though it worked fine in most cases.
-Please see [this issue](https://issuetracker.google.com/issues/237785596) (requires a Google account login) requesting to restore this feature again for more information.
+~~For Android before version 10 Google removed this feature from the [Android System WebView](https://play.google.com/store/apps/details?id=com.google.android.webview),~~
+~~even though it worked fine in most cases.~~
+~~Please see [this issue](https://issuetracker.google.com/issues/237785596) (requires a Google account login) requesting to restore this feature again for more information.~~
 
 <br />
 
diff --git a/app/build.gradle b/app/build.gradle
index 20fafc7833..e3ea859aef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -352,8 +352,8 @@ dependencies {
     def emoji_version = "1.2.0"
     def activity_version = "1.6.1" // 1.7.0-alpha01
     def fragment_version = "1.5.4" // 1.6.0-alpha03
-    def windows_version = "1.0.0" // 1.1.0-alpha03
-    def webkit_version = "1.5.0" // 1.6.0-alpha02
+    def windows_version = "1.0.0" // 1.1.0-alpha04
+    def webkit_version = "1.6.0-alpha03"
     def recyclerview_version = "1.3.0-rc01"
     def coordinatorlayout_version = "1.2.0"
     def constraintlayout_version = "2.1.4" // 2.2.0-alpha01
@@ -364,12 +364,12 @@ dependencies {
     def documentfile_version = "1.1.0-alpha01"
     def lifecycle_version = "2.5.1" // 2.6.0-alpha03
     def lifecycle_extensions_version = "2.2.0"
-    def room_version = "2.4.3" // 2.5.0-beta01
-    def sqlite_version = "2.3.0-beta01"
+    def room_version = "2.4.3" // 2.5.0-beta02
+    def sqlite_version = "2.3.0-beta02"
     def requery_version = "3.39.2"
     def paging_version = "2.1.2" //  3.2.0-alpha03
     def preference_version = "1.2.0"
-    def work_version = "2.8.0-beta01"
+    def work_version = "2.8.0-beta02"
     def exif_version = "1.3.5"
     def biometric_version = "1.2.0-alpha05"
     def billingclient_version = "4.1.0"
diff --git a/app/src/main/java/eu/faircode/email/ActivityAMP.java b/app/src/main/java/eu/faircode/email/ActivityAMP.java
index 9f76007bf8..5232ea2d34 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAMP.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java
@@ -162,7 +162,7 @@ public class ActivityAMP extends ActivityBase {
         WebSettings settings = wvAmp.getSettings();
         boolean dark = (Helper.isDarkTheme(this) && !force_light);
         boolean canDarken = WebViewEx.isFeatureSupported(this, WebViewFeature.ALGORITHMIC_DARKENING);
-        if (canDarken && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        if (canDarken)
             WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, dark);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index dde3432115..39214b67b2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6508,7 +6508,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibForceLight.setImageLevel(force_light ? 1 : 0);
                 bindBody(message, false);
             } else {
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && false) {
                     View view = LayoutInflater.from(context).inflate(R.layout.dialog_dark, null);
                     final Button btnIssue = view.findViewById(R.id.btnIssue);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java
index d69a2113eb..92c4621c67 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java
@@ -85,7 +85,7 @@ public class FragmentDialogOpenFull extends FragmentDialogBase {
 
         boolean dark = (Helper.isDarkTheme(context) && !force_light);
         boolean canDarken = WebViewEx.isFeatureSupported(context, WebViewFeature.ALGORITHMIC_DARKENING);
-        if (canDarken && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        if (canDarken)
             WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, dark);
 
         settings.setLoadsImagesAutomatically(true);
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 8c8c41f545..76267c3b7a 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -124,7 +124,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         // https://developer.android.com/reference/android/webkit/WebSettings#setAlgorithmicDarkeningAllowed(boolean)
         // https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme
         boolean canDarken = WebViewEx.isFeatureSupported(context, WebViewFeature.ALGORITHMIC_DARKENING);
-        if (canDarken && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        if (canDarken)
             WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, dark && !force_light);
         setBackgroundColor(canDarken && dark && !force_light ? Color.TRANSPARENT : Color.WHITE);