diff --git a/Wino.Mail/Controls/Advanced/WinoListView.cs b/Wino.Mail/Controls/Advanced/WinoListView.cs
index bd8e4d56..5e195237 100644
--- a/Wino.Mail/Controls/Advanced/WinoListView.cs
+++ b/Wino.Mail/Controls/Advanced/WinoListView.cs
@@ -406,20 +406,5 @@ namespace Wino.Controls.Advanced
                 internalScrollviewer.ViewChanged -= InternalScrollVeiwerViewChanged;
             }
         }
-
-        protected override DependencyObject GetContainerForItemOverride()
-        {
-            var itemContainer = base.GetContainerForItemOverride();
-
-            // Adjust scrolling margin for all containers.
-            // I don't want to override the default style for this.
-
-            if (itemContainer is ListViewItem listViewItem)
-            {
-                listViewItem.Margin = new Thickness(0, 0, 12, 4);
-            }
-
-            return itemContainer;
-        }
     }
 }
diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml
index 5899931a..847fb302 100644
--- a/Wino.Mail/Views/MailListPage.xaml
+++ b/Wino.Mail/Views/MailListPage.xaml
@@ -50,7 +50,7 @@
         <!--  Header Templates  -->
         <DataTemplate x:Key="MailGroupHeaderDefaultTemplate" x:DataType="collections:IReadOnlyObservableGroup">
             <Grid
-                Margin="2,2,6,2"
+                Margin="4,2"
                 AllowFocusOnInteraction="False"
                 Background="{ThemeResource MailListHeaderBackgroundColor}"
                 CornerRadius="6">