diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
index ff796e37..ce17da4a 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
@@ -137,6 +137,9 @@
                         <PathIcon Data="{StaticResource OrderedListPathIcon}" />
                     </AppBarToggleButton.Icon>
                 </AppBarToggleButton>
+
+                <AppBarSeparator />
+
                 <AppBarButton
                     x:Name="DecreaseIndentButton"
                     Width="48"
@@ -157,18 +160,6 @@
                         <PathIcon Data="{StaticResource IncreaseIndentPathIcon}" />
                     </AppBarButton.Icon>
                 </AppBarButton>
-                <AppBarSeparator />
-
-                <AppBarToggleButton
-                    x:Name="DirectionButton"
-                    Width="48"
-                    Click="DirectionButtonClicked"
-                    Label="Direction"
-                    ToolTipService.ToolTip="Direction">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource ParagraphPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
 
                 <AppBarElementContainer VerticalAlignment="Center">
                     <ComboBox x:Name="AlignmentListView" SelectionChanged="AlignmentChanged">
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index f08190dd..099212e8 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -170,11 +170,6 @@ namespace Wino.Dialogs
             await InvokeScriptSafeAsync("editor.execCommand('outdent')");
         }
 
-        private async void DirectionButtonClicked(object sender, RoutedEventArgs e)
-        {
-            await InvokeScriptSafeAsync("document.getElementById('directionButton').click();");
-        }
-
         private async void AlignmentChanged(object sender, SelectionChangedEventArgs e)
         {
             var selectedItem = AlignmentListView.SelectedItem as ComboBoxItem;
diff --git a/Wino.Mail/JS/editor.js b/Wino.Mail/JS/editor.js
index ffbe3a03..328f7c2a 100644
--- a/Wino.Mail/JS/editor.js
+++ b/Wino.Mail/JS/editor.js
@@ -12,7 +12,8 @@ const editor = Jodit.make("#editor", {
     "showPlaceholder": false,
     "uploader": {
         "insertImageAsBase64URI": true
-    }
+    },
+    "enter": "DIV",
 });
 
 // Handle the image input change event
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
index 6724d7ac..37b43af5 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail/Views/ComposePage.xaml
@@ -263,6 +263,8 @@
                                     </ToggleButton.Content>
                                 </ToggleButton>
 
+                                <AppBarSeparator />
+
                                 <Button
                                     x:Name="DecreaseIndentButton"
                                     Height="32"
@@ -285,19 +287,6 @@
                                     </Button.Content>
                                 </Button>
 
-                                <AppBarSeparator />
-
-                                <ToggleButton
-                                    x:Name="DirectionButton"
-                                    Height="32"
-                                    Click="DirectionButtonClicked">
-                                    <ToggleButton.Content>
-                                        <Viewbox Width="16">
-                                            <PathIcon Data="{StaticResource ParagraphPathIcon}" />
-                                        </Viewbox>
-                                    </ToggleButton.Content>
-                                </ToggleButton>
-
                                 <ComboBox
                                     x:Name="AlignmentListView"
                                     Width="120"
diff --git a/Wino.Mail/Views/ComposePage.xaml.cs b/Wino.Mail/Views/ComposePage.xaml.cs
index 1e8fb291..b72b7cc4 100644
--- a/Wino.Mail/Views/ComposePage.xaml.cs
+++ b/Wino.Mail/Views/ComposePage.xaml.cs
@@ -206,11 +206,6 @@ namespace Wino.Views
             await InvokeScriptSafeAsync("editor.execCommand('outdent')");
         }
 
-        private async void DirectionButtonClicked(object sender, RoutedEventArgs e)
-        {
-            await InvokeScriptSafeAsync("document.getElementById('directionButton').click();");
-        }
-
         private async void AlignmentChanged(object sender, SelectionChangedEventArgs e)
         {
             var selectedItem = AlignmentListView.SelectedItem as ComboBoxItem;