diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
index dfd957f8..7fb4b40d 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
@@ -29,7 +29,7 @@
     <Grid Margin="0,20,0,0" RowSpacing="30">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="400" />
+            <RowDefinition Height="*" MaxHeight="400" />
         </Grid.RowDefinitions>
 
         <TextBox
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index 747b8fc6..189ef58f 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -10,7 +10,6 @@ using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Messages.Mails;
 using Wino.Views.Settings;
 
 namespace Wino.Dialogs
@@ -269,11 +268,13 @@ namespace Wino.Dialogs
 
             if (IsComposerDarkMode)
             {
-                await InvokeScriptSafeAsync("DarkReader.enable();");
+                Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
+                await InvokeScriptSafeAsync("SetDarkEditor();");
             }
             else
             {
-                await InvokeScriptSafeAsync("DarkReader.disable();");
+                Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
+                await InvokeScriptSafeAsync("SetLightEditor();");
             }
         }
 
@@ -365,16 +366,8 @@ namespace Wino.Dialogs
 
         private void DOMLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => _domLoadedTask.TrySetResult(true);
 
-        public async void Receive(HtmlRenderingRequested message)
-        {
-            await RenderInternalAsync(message.HtmlBody);
-        }
-
         private void SignatureNameTextBoxTextChanged(object sender, TextChangedEventArgs e) => IsPrimaryButtonEnabled = !string.IsNullOrWhiteSpace(SignatureNameTextBox.Text);
 
-        private void InvertComposerThemeClicked(object sender, RoutedEventArgs e)
-        {
-            IsComposerDarkMode = !IsComposerDarkMode;
-        }
+        private void InvertComposerThemeClicked(object sender, RoutedEventArgs e) => IsComposerDarkMode = !IsComposerDarkMode;
     }
 }