diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp
index 5745511eed..a20c33cb4c 100644
--- a/src/apps/mail/Header.cpp
+++ b/src/apps/mail/Header.cpp
@@ -402,9 +402,11 @@ THeaderView::THeaderView(bool incoming, bool resending, int32 defaultAccount)
 
 	BGridLayout* layout = GridLayout();
 
-	if (fIncoming)
+	if (fIncoming) {
 		layout->SetHorizontalSpacing(0);
-	layout->SetVerticalSpacing(B_USE_HALF_ITEM_SPACING);
+		layout->SetVerticalSpacing(0);
+	} else
+		layout->SetVerticalSpacing(B_USE_HALF_ITEM_SPACING);
 
 	int32 row = 0;
 	if (fromField != NULL) {
@@ -412,14 +414,31 @@ THeaderView::THeaderView(bool incoming, bool resending, int32 defaultAccount)
 		layout->AddItem(fromField->CreateMenuBarLayoutItem(), 1, row++, 3, 1);
 	} else if (fFromControl != NULL) {
 		layout->AddItem(fFromControl->CreateLabelLayoutItem(), 0, row);
-		layout->AddItem(fFromControl->CreateTextViewLayoutItem(), 1, row++,
-			3, 1);
+		layout->AddItem(fFromControl->CreateTextViewLayoutItem(), 1, row);
 	}
 
-	layout->AddView(fToLabel, 0, row);
-	layout->AddView(fToControl, 1, row++, 3, 1);
-	layout->AddView(fCcLabel, 0, row);
-	layout->AddView(fCcControl, 1, row, fIncoming ? 3 : 1, 1);
+	if (fIncoming) {
+		layout->AddView(fToLabel, 2, row);
+		layout->AddView(fToControl, 3, row++);
+	} else {
+		row++;
+		layout->AddView(fToLabel, 0, row);
+		layout->AddView(fToControl, 1, row++, 3, 1);
+	}
+
+	if (fDateControl != NULL) {
+		layout->AddItem(fDateControl->CreateLabelLayoutItem(), 0, row);
+		layout->AddItem(fDateControl->CreateTextViewLayoutItem(), 1, row);
+	}
+
+	if (fIncoming && (fCcControl != NULL)) {
+		layout->AddView(fCcLabel, 2, row);
+		layout->AddView(fCcControl, 3, row++);
+	} else {
+		row++;
+		layout->AddView(fCcLabel, 0, row);
+		layout->AddView(fCcControl, 1, row, 1, 1);
+	}
 	if (fBccControl != NULL) {
 		layout->AddView(new LabelView(B_TRANSLATE("Bcc:")), 2, row);
 		layout->AddView(fBccControl, 3, row++);
@@ -428,12 +447,6 @@ THeaderView::THeaderView(bool incoming, bool resending, int32 defaultAccount)
 	layout->AddItem(fSubjectControl->CreateLabelLayoutItem(), 0, row);
 	layout->AddItem(fSubjectControl->CreateTextViewLayoutItem(), 1, row++,
 		3, 1);
-
-	if (fDateControl != NULL) {
-		layout->AddItem(fDateControl->CreateLabelLayoutItem(), 0, row);
-		layout->AddItem(fDateControl->CreateTextViewLayoutItem(), 1, row++,
-			3, 1);
-	}
 }