diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp
index 8681733233..5745511eed 100644
--- a/src/apps/mail/Header.cpp
+++ b/src/apps/mail/Header.cpp
@@ -402,7 +402,6 @@ THeaderView::THeaderView(bool incoming, bool resending, int32 defaultAccount)
 
 	BGridLayout* layout = GridLayout();
 
-	layout->SetInsets(B_USE_DEFAULT_SPACING);
 	if (fIncoming)
 		layout->SetHorizontalSpacing(0);
 	layout->SetVerticalSpacing(B_USE_HALF_ITEM_SPACING);
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index d6dc5183d7..27ed9118e7 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -557,11 +557,11 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
 		.Add(fMenuBar)
+		.Add(fToolBar)
 		.AddGroup(B_VERTICAL, 0)
-			.Add(fToolBar)
 			.Add(fHeaderView)
-			.SetInsets(B_USE_WINDOW_SPACING, 0, B_USE_WINDOW_SPACING, 0)
-			.End()
+			.SetInsets(B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING)
+		.End()
 		.Add(fContentView);
 
 	if (to != NULL)