diff --git a/Wino.Mail/JS/Quill/full.html b/Wino.Mail/JS/Quill/full.html
index e1c7db72..1433d772 100644
--- a/Wino.Mail/JS/Quill/full.html
+++ b/Wino.Mail/JS/Quill/full.html
@@ -242,12 +242,10 @@
         }
 
         function SetLightEditor(){
-            document.documentElement.setAttribute('data-theme', 'light');
             DarkReader.disable();
         }
 
         function SetDarkEditor(){
-            document.documentElement.setAttribute('data-theme', 'dark');
             DarkReader.enable();
         }
 
diff --git a/Wino.Mail/JS/Quill/reader.html b/Wino.Mail/JS/Quill/reader.html
index cd7e6f79..f5e54fe9 100644
--- a/Wino.Mail/JS/Quill/reader.html
+++ b/Wino.Mail/JS/Quill/reader.html
@@ -1,39 +1,38 @@
 <html>
-    <body style="padding-left:12px; padding-right:12px; padding-top:8px; padding-bottom: 8px; margin: 0px; border-radius: 8px;">
-        <meta name="color-scheme" content="dark light">
-        <script src="https://app.reader/darkreader.js"></script>
+<body style="padding-left:12px; padding-right:12px; padding-top:8px; padding-bottom: 8px; margin: 0px; border-radius: 8px;">
+    <meta name="color-scheme" content="dark light">
+    <script src="https://app.reader/darkreader.js"></script>
 
-        <script>
-            function RenderHTML(htmlString) {
-                var containerDiv = document.getElementById("readerDiv");
-                containerDiv.innerHTML = htmlString;
-            }
+    <script>
+        function RenderHTML(htmlString) {
+            var containerDiv = document.getElementById("readerDiv");
+            containerDiv.innerHTML = htmlString;
+        }
 
-            function ChangeFontFamily(fontFamily) {
-                var containerDiv = document.getElementById("readerDiv");
-                containerDiv.style.fontFamily = fontFamily;
-            }
+        function ChangeFontFamily(fontFamily) {
+            var containerDiv = document.getElementById("readerDiv");
+            containerDiv.style.fontFamily = fontFamily;
+        }
 
-            function ChangeFontSize(size) {
-                var containerDiv = document.getElementById("readerDiv");
-                containerDiv.style.fontSize = size;
-            }
+        function ChangeFontSize(size) {
+            var containerDiv = document.getElementById("readerDiv");
+            containerDiv.style.fontSize = size;
+        }
 
-            function SetLightEditor() {
-                document.documentElement.setAttribute('data-theme', 'light');
-                DarkReader.disable();
-            }
+        function SetLightEditor() {
+            document.documentElement.setAttribute('data-theme', 'light');
+            DarkReader.disable();
+        }
 
-            function SetDarkEditor() {
-                document.documentElement.setAttribute('data-theme', 'dark');
-                DarkReader.enable();
-            }
-        </script>
+        function SetDarkEditor() {
+            document.documentElement.setAttribute('data-theme', 'dark');
+            DarkReader.enable();
+        }
+    </script>
 
-        <link rel="stylesheet" href="https://app.reader/reader.css" />
-        <link rel="stylesheet" href="https://app.reader/global.css" />
-
-        <div id="readerDiv">
-        </div>
-    </body>
+    <link rel="stylesheet" href="https://app.reader/reader.css" />
+    <div id="readerDiv">
+    </div>
+    <link rel="stylesheet" href="https://app.reader/global.css" />
+</body>
 </html>
diff --git a/Wino.Mail/Views/ComposePage.xaml.cs b/Wino.Mail/Views/ComposePage.xaml.cs
index 1591cbec..921cd096 100644
--- a/Wino.Mail/Views/ComposePage.xaml.cs
+++ b/Wino.Mail/Views/ComposePage.xaml.cs
@@ -56,6 +56,7 @@ namespace Wino.Views
             InitializeComponent();
 
             Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
+            Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation");
         }
 
         private static async void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml.cs b/Wino.Mail/Views/MailRenderingPage.xaml.cs
index 3cde6c20..5b18de9c 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml.cs
+++ b/Wino.Mail/Views/MailRenderingPage.xaml.cs
@@ -42,7 +42,7 @@ namespace Wino.Views
             InitializeComponent();
 
             Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
-
+            Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation");
             NavigationCacheMode = NavigationCacheMode.Enabled;
         }
 
diff --git a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
index a310b8d5..41e84625 100644
--- a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
+++ b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
@@ -31,6 +31,7 @@ namespace Wino.Views.Settings
             this.InitializeComponent();
 
             // Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
+            Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation");
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
