diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml
index fd74c0bd..badaf85e 100644
--- a/Wino.Mail/Views/MailListPage.xaml
+++ b/Wino.Mail/Views/MailListPage.xaml
@@ -407,7 +407,7 @@
         </Grid>
     </wino:BasePage.ShellContent>
 
-    <Grid x:Name="RootGrid">
+    <Grid x:Name="RootGrid" Padding="0,0,0,7">
         <Grid.ColumnDefinitions>
             <ColumnDefinition
                 x:Name="ReaderColumn"
@@ -420,7 +420,6 @@
         <Border
             x:Name="ReaderGridContainer"
             Grid.Column="0"
-            Margin="0,0,0,7"
             Padding="5,0,0,0"
             Background="{ThemeResource WinoContentZoneBackgroud}"
             BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index a0841445..05c2772d 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -149,15 +149,16 @@
     </Page.Resources>
 
     <!--  Attachments and WebView2  -->
-    <Grid x:Name="RendererGridFrame" Padding="7,0,7,7">
+    <Grid
+        x:Name="RendererGridFrame"
+        Padding="7,0"
+        RowSpacing="7">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <Border
-            Grid.Row="0"
-            Margin="0,0,0,7"
             Background="{ThemeResource WinoContentZoneBackgroud}"
             BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
@@ -171,7 +172,6 @@
                 </Grid.RowDefinitions>
                 <CommandBar
                     x:Name="RendererBar"
-                    Grid.Row="0"
                     Margin="8,6,0,0"
                     HorizontalContentAlignment="Stretch"
                     DefaultLabelPosition="Right"