diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 59eb691f2c..eefa4e4c81 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -235,7 +235,7 @@ class mail_compose
 		{
 			foreach ($actions as $key => $action)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]'))) {
+				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet
index b8480a2228..07df521c1c 100644
--- a/mail/templates/mobile/index.xet
+++ b/mail/templates/mobile/index.xet
@@ -16,7 +16,7 @@
 				<row>
 					<description class="$row_cont[class] mobile_cat_col"/>
 					<vbox>
-						<url-email id="${row}[fromaddress]" contact_plus = "true"  class="$row_cont[class]" readonly="true"/>
+						<url-email id="${row}[fromaddress]" class="$row_cont[class]" readonly="true"/>
 						<hbox>
 							<description  class="status_img $row_cont[class]"/>
 							<description id="${row}[subject]" no_lang="1" class="$row_cont[class]" />
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 6054c52b14..990a1ad954 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -2670,9 +2670,12 @@ div.mailComposeHeaderSection > table {
     padding-top: 10px;
     font-weight: bold;
   }
+  body #popupMainDiv #mail-display .mail-d-h1 span {
+    font-size: 12pt;
+  }
   body #popupMainDiv #mail-display .mail-d-h2 {
     padding-top: 5px;
-    font-size: 9pt;
+    font-size: 10pt;
     color: grey;
   }
   body #popupMainDiv #mail-display .mail-d-h2 a,
@@ -2684,7 +2687,7 @@ div.mailComposeHeaderSection > table {
   body #popupMainDiv #mail-display .mail-d-h2 a#mail-display_FROM > * {
     color: black;
     padding-top: 15px;
-    font-size: 9.5;
+    font-size: 12pt;
   }
   body #popupMainDiv #mail-display .et2_details {
     width: 50%;
@@ -2791,8 +2794,8 @@ div.mailComposeHeaderSection > table {
     padding-bottom: 8px;
   }
   #mail-index table.egwGridView_outer tbody td a[id^='mail-index_'][id$='fromaddress]'] {
-    color: #26537c;
-    font-size: 10pt;
+    color: #373737;
+    font-size: 12pt;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -2810,6 +2813,9 @@ div.mailComposeHeaderSection > table {
     white-space: nowrap;
     text-overflow: ellipsis;
     width: 98%;
+    font-size: 10pt;
+    color: #828282 !important;
+    font-weight: normal !important;
   }
   #mail-index table.egwGridView_outer tbody td label[id^='mail-index_'][id$='date]'] {
     padding-top: 0;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index dfcd0332cb..b9f383864e 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1822,13 +1822,16 @@ div.mailComposeHeaderSection > table {
 				.mail-d-h1{
 					padding-bottom: 15px;
 					border-bottom: 1px solid silver;
-					font-size: 12pt;
+					span {
+						.mob-fontsize-l;
+					}
+					.mob-fontsize-l;
 					padding-top: 10px;
 					font-weight: bold;
 				}
 				.mail-d-h2{
 					padding-top: 5px;
-					font-size: 9pt;
+					.mob-fontsize-n;
 					color: grey;
 					a,span,.et2_label {
 						color: grey;
@@ -1837,7 +1840,7 @@ div.mailComposeHeaderSection > table {
 					a#mail-display_FROM>* {
 						color:black;
 						padding-top: 15px;
-						font-size: 9.5;
+						.mob-fontsize-l;
 					}
 					
 				}
@@ -1956,8 +1959,8 @@ div.mailComposeHeaderSection > table {
 				padding-top: 8px;
 				padding-bottom: 8px;
 				a[id^='mail-index_'][id$='fromaddress]']{
-					color:#26537c;
-					.mob-fontsize-n;
+					color:@gray_80;
+					.mob-fontsize-l;
 					overflow: hidden;
 					white-space: nowrap;
 					text-overflow: ellipsis;
@@ -1975,6 +1978,9 @@ div.mailComposeHeaderSection > table {
 					white-space: nowrap;
 					text-overflow: ellipsis;
 					width: 98%;
+					.mob-fontsize-n;
+					color: @gray_50 !important;
+					font-weight: normal !important;
 				}
 				label[id^='mail-index_'][id$='date]']{
 					padding-top: 0;