diff --git a/Elwig/Windows/MailWindow.xaml b/Elwig/Windows/MailWindow.xaml
index 8335e27..ef8450d 100644
--- a/Elwig/Windows/MailWindow.xaml
+++ b/Elwig/Windows/MailWindow.xaml
@@ -29,7 +29,12 @@
     <TabControl x:Name="TabControl" BorderThickness="0" PreviewDragOver="Document_PreviwDragOver" AllowDrop="True" Drop="Document_Drop">
         <TabItem Header="Dokumente" Visibility="Collapsed">
             <Grid>
-                <Grid Width="600" Height="200" VerticalAlignment="Top" HorizontalAlignment="Left">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="320"/>
+                </Grid.ColumnDefinitions>
+
+                <Grid Height="200" VerticalAlignment="Top" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="25"/>
@@ -67,7 +72,7 @@
                             Click="SelectDocumentButton_Click"/>
                 </Grid>
 
-                <GroupBox x:Name="DocumentBox" Header="Dokument" Margin="10,170,10,47" Width="580" HorizontalAlignment="Left">
+                <GroupBox x:Name="DocumentBox" Header="Dokument" Margin="10,170,10,47" HorizontalAlignment="Stretch">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="70"/>
@@ -87,7 +92,7 @@
                     </Grid>
                 </GroupBox>
 
-                <GroupBox Header="Adressaten" Margin="610,10,10,47">
+                <GroupBox Header="Adressaten" Margin="10,10,10,47" Grid.Column="1">
                     <Grid>
                         <RadioButton GroupName="Recipients" x:Name="RecipientsActiveMembersInput" Content="aktive Mitglieder"
                                      Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
@@ -129,7 +134,7 @@
                     </Grid>
                 </GroupBox>
 
-                <Button x:Name="ContinueButton" Content="Weiter"
+                <Button x:Name="ContinueButton" Content="Weiter" Grid.Column="1"
                         Margin="10,10,10,10" Height="27" Width="100" Padding="9,3" FontSize="14"
                         VerticalAlignment="Bottom" HorizontalAlignment="Right"
                         Click="ContinueButton_Click"/>