diff --git a/api/js/etemplate/et2_widget_box.ts b/api/js/etemplate/et2_widget_box.ts
index 6d63865419..dc181b5f24 100644
--- a/api/js/etemplate/et2_widget_box.ts
+++ b/api/js/etemplate/et2_widget_box.ts
@@ -66,7 +66,7 @@ export class et2_box extends et2_baseWidget implements et2_IDetachedDOM
 	 * @param {object} _node
 	 */
 	loadFromXML(_node) {
-		if(this.getType() != "box")
+		if(this.getType() != "old-box")
 		{
 			return super.loadFromXML(_node);
 		}
@@ -162,7 +162,7 @@ export class et2_box extends et2_baseWidget implements et2_IDetachedDOM
 	}
 
 }
-et2_register_widget(et2_box, ["vbox", "box"]);
+et2_register_widget(et2_box, ["old-vbox", "old-box"]);
 
 /**
  * Details widget implementation
diff --git a/api/js/etemplate/et2_widget_hbox.ts b/api/js/etemplate/et2_widget_hbox.ts
index 9aee04020b..d25a11e6a8 100644
--- a/api/js/etemplate/et2_widget_hbox.ts
+++ b/api/js/etemplate/et2_widget_hbox.ts
@@ -199,6 +199,6 @@ export class et2_hbox extends et2_baseWidget
 		}
 	}
 }
-et2_register_widget(et2_hbox, ["hbox"]);
+et2_register_widget(et2_hbox, ["old-hbox"]);
 
 
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 2b51eb6d91..d29b806075 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -637,7 +637,7 @@ div.mailDisplayHeaders div.mail_extraEmails.visible
 	box-shadow: 5px 5px 5px #aaa;
 	border: 1px solid gray;
 }
-div.mailComposeBody {
+.mailComposeBody {
 	white-space: normal !important;
 }
 #mail-compose_mail_plaintext {
@@ -884,11 +884,11 @@ span#mail-compose_replyto_expander {
 	padding: 0;
 }
 /*Make file uploads in compose dialog invisible*/
-div.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, div.mail-compose_toolbar_assist {
+.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, .mail-compose_toolbar_assist {
 	display:none;
 }
 /*Make file uploads in compose dialog invisible*/
-div.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, div.mail-compose_toolbar_assist {
+.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, .mail-compose_toolbar_assist {
 	display:none;
 }
 
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 8ebdd9ff25..5ea58e5b15 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -86,12 +86,12 @@
 			</grid>
 		</vbox>
 		<vbox class="mailComposeBodySection" width="100%">
-			<hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
+			<old-hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
 				<htmlarea name="mail_htmltext" id="mail_htmltext" statusbar="false" menubar="false" toolbar="@html_toolbar" imageUpload="link_to" expand_toolbar="true" height="478px" width="100%" resize_ratio="0"/>
-			</hbox>
-			<hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
+			</old-hbox>
+			<old-hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
 				<textbox multiline="true" rows="40" cols="120" width="100%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/>
-			</hbox>
+			</old-hbox>
 			<vbox class="et2_file mailUploadSection" disabled="@no_griddata">
 				<hbox>
 					<select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"/>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 1bea9571c0..e0ec0d7ba0 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -5,43 +5,43 @@
 	<template id="mail.index.splitter" height="100%" template="" lang="" group="0" version="1.9.001">
 		<split dock_side="bottomDock" id="mailSplitter">
 			<nextmatch id="nm" onselect="app.mail.mail_preview" class="" template="mail.index.rows" header_left="mail.index.add" header_right="mail.index.header_right" disable_selection_advance="true"/>
-			<vbox id="mailPreview" width="100%">
+			<old-vbox id="mailPreview" width="100%">
 				<toolbar id="toolbar"/>
-				<box id="blank" disabled="false">
+				<old-box id="blank" disabled="false">
 					<image src="mail"/>
 					<description value="Select an item to read"/>
-				</box>
-				<hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
+				</old-box>
+				<old-hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
 					<description value="From"/>
-					<hbox id="additionalFromAddress" class="mail_extraEmails">
-					</hbox>
+					<old-hbox id="additionalFromAddress" class="mail_extraEmails">
+					</old-hbox>
 					<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-				</hbox>
-				<hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
+				</old-hbox>
+				<old-hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
 					<description value="Subject"/>
 					<description align="left" id="previewSubject" readonly="true" hover_action="app.mail.modifyMessageSubjectDialog" hover_action_title="Modify subject of this message"/>
-				</hbox>
-				<hbox id="mailPreviewHeadersDate" class="mailPreviewHeaders">
+				</old-hbox>
+				<old-hbox id="mailPreviewHeadersDate" class="mailPreviewHeaders">
 					<description value="Date"/>
 					<date-time align="left" id="previewDate" readonly="true"/>
-				</hbox>
-				<hbox width="100%" id="mailPreviewHeadersTo" class="mailPreviewHeaders">
+				</old-hbox>
+				<old-hbox width="100%" id="mailPreviewHeadersTo" class="mailPreviewHeaders">
 					<description value="To"/>
-					<hbox id="additionalToAddress" class="mail_extraEmails">
-					</hbox>
+					<old-hbox id="additionalToAddress" class="mail_extraEmails">
+					</old-hbox>
 					<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-				</hbox>
-				<hbox id="mailPreviewHeadersCC" class="mailPreviewHeaders">
+				</old-hbox>
+				<old-hbox id="mailPreviewHeadersCC" class="mailPreviewHeaders">
 					<description value="CC"/>
-					<hbox id="additionalCCAddress" class="mail_extraEmails">
-					</hbox>
+					<old-hbox id="additionalCCAddress" class="mail_extraEmails">
+					</old-hbox>
 					<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-				</hbox>
-				<hbox class="mailPreviewHeaders smimeIcons">
+				</old-hbox>
+				<old-hbox class="mailPreviewHeaders smimeIcons">
 					<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="true" align="right" width="24"/>
 					<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="true" align="right" width="24"/>
-				</hbox>
-				<hbox id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
+				</old-hbox>
+				<old-hbox id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
 					<description value="Attachments"/>
 					<grid disabled="@no_griddata" id="previewAttachmentArea" class="previewAttachmentArea egwGridView_grid">
 						<columns>
@@ -72,11 +72,11 @@
 						</rows>
 					</grid>
 					<buttononly class="et2_button ui-button" label="Show all attachments" image="foldertree_nolines_plus"  width="16px" height="16px" onclick="app.mail.showAllHeader"/>
-				</hbox>
-				<box id="mailPreviewContainer">
+				</old-hbox>
+				<old-box id="mailPreviewContainer">
 					<iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>
-				</box>
-			</vbox>
+				</old-box>
+			</old-vbox>
 		</split>
 	</template>
 	<template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 180229cfef..58666fe276 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -850,15 +850,15 @@ span#mail-compose_replyto_expander {
   padding: 0;
 }
 /*Make file uploads in compose dialog invisible*/
-div.mail-compose_toolbar_assist div.mail-compose_fileselector,
+.mail-compose_toolbar_assist div.mail-compose_fileselector,
 #mail-compose_selectFromVFSForCompose,
-div.mail-compose_toolbar_assist {
+.mail-compose_toolbar_assist {
   display: none;
 }
 /*Make file uploads in compose dialog invisible*/
-div.mail-compose_toolbar_assist div.mail-compose_fileselector,
+.mail-compose_toolbar_assist div.mail-compose_fileselector,
 #mail-compose_selectFromVFSForCompose,
-div.mail-compose_toolbar_assist {
+.mail-compose_toolbar_assist {
   display: none;
 }
 div.mailComposeHeaderSection > table {
@@ -2072,6 +2072,7 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
   border-left: 12px solid #B4B4B4;
 }
-#mail-index_nm.et2_nextmatch.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr.row_category td:first-child > div {
   margin-left: 0px;
+  padding-left: 0px;
 }