diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index da12e00d72..be33658566 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -3684,8 +3684,8 @@ table.et2_grid > tbody > tr > td {
     padding-right: 5px;
 }
 .popupMainDiv table.et2_grid > tbody > tr > td{
-    padding: 0;
-    padding-right: 5px;
+    padding-top: 2px;
+    padding-bottom: 3px;
 }
 
 table.et2_grid > tbody > tr > td:last-child {
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index aed1f3373c..c9e4580c30 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -356,6 +356,7 @@ div.mailUploadSection > div.et2_hbox > label {
 	min-width: 15ex;
 }
 #mail-compose_selectFromVFSForCompose{
+	display: none;
 	width:20px;
 	float:none;
 	background-color: transparent;
@@ -917,6 +918,10 @@ and (orientation : landscape) {
 	display:none;
 }
 
+et2-vbox.mailComposeHeaderSection{
+	padding-bottom: 5px;
+}
+
 div.mailComposeHeaderSection>table {
 	padding-top: 35px;
 }