diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 864bbe69cb..d263ba762f 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -876,3 +876,5 @@ div.mailComposeHeaderSection>table {
 .sieve-title .ruleID::before {content:'#'}
 
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}
+
+#mail-compose_mailaccount {max-width: 100% !important;}
\ No newline at end of file
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index d6aed4363d..3814fbef74 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -74,7 +74,9 @@
 					<row class="mailComposeHeaders">
 						<description value="Subject"/>
 						<textbox align="left" width="100%" id="subject" height="25" onchange="app.mail.subject2title"/>
-						<checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable" tabindex="7"/>
+						<hbox align="right">
+							<checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable" tabindex="7"/>
+						</hbox>
 					</row>
 					<row>
 						<description/>
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 6ee35bbed7..2b3325eb41 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -861,6 +861,9 @@ div.mailComposeHeaderSection > table {
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
   border-left: 12px solid transparent;
 }
+#mail-compose_mailaccount {
+  max-width: 100% !important;
+}
 #popupMainDiv {
   padding: 5px;
 }
@@ -2285,6 +2288,9 @@ div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
   width: 24px;
   height: 24px;
 }
+div.mailPreviewHeaders img.et2_button_icon {
+  background-color: inherit;
+}
 #mail-index_previewAttachmentArea {
   background-color: #f0f0f0;
   border-color: #E6E6E6;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index b827217b2c..9a29bd012c 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -849,6 +849,9 @@ div.mailComposeHeaderSection > table {
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
   border-left: 12px solid transparent;
 }
+#mail-compose_mailaccount {
+  max-width: 100% !important;
+}
 #popupMainDiv {
   padding: 5px;
 }