diff --git a/Elwig/Windows/MailWindow.xaml b/Elwig/Windows/MailWindow.xaml
index 537c77b..c0cf2a2 100644
--- a/Elwig/Windows/MailWindow.xaml
+++ b/Elwig/Windows/MailWindow.xaml
@@ -69,7 +69,7 @@
                                Grid.Column="0" Margin="10,8,10,10"/>
                         <ListBox x:Name="AvaiableDocumentsList"
                                  Grid.Column="0" Margin="10,30,10,10"
-                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged"/>
+                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged" MouseDoubleClick="AvaiableDocumentsList_MouseDoubleClick"/>
 
                         <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
                                 Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
@@ -82,7 +82,7 @@
                                Grid.Column="2" Margin="10,8,10,10"/>
                         <ListBox x:Name="SelectedDocumentsList" DisplayMemberPath="Name"
                                  Grid.Column="2" Margin="10,30,10,37"
-                                 SelectionChanged="SelectedDocumentsList_SelectionChanged">
+                                 SelectionChanged="SelectedDocumentsList_SelectionChanged" MouseDoubleClick="SelectedDocumentsList_MouseDoubleClick">
                             <ListBox.InputBindings>
                                 <KeyBinding Key="Delete" Command="{Binding Path=DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>
                             </ListBox.InputBindings>
diff --git a/Elwig/Windows/MailWindow.xaml.cs b/Elwig/Windows/MailWindow.xaml.cs
index edb97cf..47b36c8 100644
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -333,7 +333,35 @@ namespace Elwig.Windows {
             }
         }
 
-        private async void DocumentAddButton_Click(object sender, RoutedEventArgs evt) {
+        private void AvaiableDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
+            if (evt.LeftButton != MouseButtonState.Pressed) return;
+            var src = evt.OriginalSource;
+            if (src is Border b) {
+                src = (b.Child as ContentPresenter)?.Content.ToString();
+            } else if (src is TextBlock t) {
+                src = t.Text;
+            } else {
+                return;
+            }
+            AvaiableDocumentsList.SelectedIndex = AvaiableDocumentsList.ItemsSource.Cast<object?>().ToList().IndexOf(src);
+            DocumentAddButton_Click(sender, null);
+        }
+
+        private void SelectedDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
+            if (evt.LeftButton != MouseButtonState.Pressed) return;
+            var src = evt.OriginalSource;
+            if (src is Border b) {
+                src = (b.Child as ContentPresenter)?.Content.ToString();
+            } else if (src is TextBlock t) {
+                src = t.Text;
+            } else {
+                return;
+            }
+            SelectedDocumentsList.SelectedItem = SelectedDocs.FirstOrDefault(d => d.Name == (string?)src);
+            DocumentRemoveButton_Click(sender, null);
+        }
+
+        private async void DocumentAddButton_Click(object sender, RoutedEventArgs? evt) {
             var idx = AvaiableDocumentsList.SelectedIndex;
             using var ctx = new AppDbContext();
             if (AvaiableDocumentsList.SelectedItem is not string s)
@@ -353,7 +381,7 @@ namespace Elwig.Windows {
             await UpdateRecipients(ctx);
         }
 
-        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) {
+        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs? evt) {
             DeleteCommand.Execute(null);
             using var ctx = new AppDbContext();
             await UpdateRecipients(ctx);