diff --git a/mail/templates/kdots/index.xet b/mail/templates/kdots/index.xet
index b4108e8a1f..f3e6981158 100644
--- a/mail/templates/kdots/index.xet
+++ b/mail/templates/kdots/index.xet
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
-    <template id="mail.index.preview" slot="right">
+    <template id="mail.index.preview">
+        <toolbar id="toolbar" list_header="short"/>
         <grid id="mailPreview" width="100%">
             <columns>
                 <column/>
@@ -19,8 +20,8 @@
                         <et2-hbox class="mailPreviewHeaders">
                             <et2-description id="subject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
                             <et2-hbox class="mailPreviewHeaders smimeIcons">
-                                <et2-image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
-                                <et2-image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+                                <et2-image id="smime_signature" src="smime_sign" statustext="Smime signed message" hidden="!@smime=smime_sign" align="right" width="24"></et2-image>
+                                <et2-image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" hidden="!@smime=smime_encrypt" align="right" width="24"></et2-image>
                             </et2-hbox>
                         </et2-hbox>
                         <et2-hbox width="100%" class="mailPreviewHeaders">
@@ -58,8 +59,8 @@
                                                         <column disabled="!@showtempname"/>
                                                         <column disabled="!@showtempname"/>
                                                         <column disabled="!@showtempname"/>
-                                                        <column width="70%"/>
-                                                        <column width="20%"/>
+                                                        <column/>
+                                                        <column/>
                                                     </columns>
                                                     <rows>
                                                         <row class="row attachmentRow">
@@ -79,9 +80,9 @@
                                                     <column disabled="!@showtempname"/>
                                                     <column disabled="!@showtempname"/>
                                                     <column disabled="!@showtempname"/>
-                                                    <column width="70%"/>
-                                                    <column width="11%"/>
-                                                    <column width="10%"/>
+                                                    <column/>
+                                                    <column/>
+                                                    <column/>
                                                 </columns>
                                                 <rows>
                                                     <row class="row attachmentRow" id="${row}">
@@ -111,7 +112,7 @@
     <template id="mail.index.splitter" height="100%" template="" lang="" group="0" version="1.9.001">
         <et2-split id="mailSplitter" style="--min: 30%;--max:min(70%,calc(100% - 30em));" vertical="false" primary="start">
             <nextmatch id="nm" onselect="app.mail.mail_preview" class="" template="mail.index.rows.vertical" header_left="mail.index.add" header_right="mail.index.header_right" disable_selection_advance="true"/>
-
+            <template id="mail.index.preview"/>
         </et2-split>
     </template>
     <template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">
@@ -121,7 +122,7 @@
     <template id="mail.index.add" template="" lang="" group="0" version="1.9.001">
         <et2-button id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" image="add" noSubmit="true"></et2-button>
     </template>
-    <template id="mail.index.header_right" template="" lang="" group="0" version="1.9.001" slot="right-header">
+    <template id="mail.index.header_right" template="" lang="" group="0" version="1.9.001">
         <et2-details id="mail.index.vacationnotice" disabled="true" summary="on vacation" toggleOnHover="true" hoist="true" class="vacationnotice" onclick="app.mail.edit_vacation">
             <et2-description id="nm[vacationnotice]" class="@nm[vacationclass]"></et2-description>
             <et2-description id="nm[vacationrange]" class="@nm[vacationrangeclass]"></et2-description>
@@ -139,13 +140,7 @@
         <et2-tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder"
                   onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd"
                   highlighting="true" parentId="mail-tree_target" slot="left"/>
-        <et2-box slot="right-header">
-            <toolbar id="toolbar" list_header="short" slot="right-header"/>
-        </et2-box>
-        <et2-box slot="right">
-            <template id="mail.index.preview"/>
-        </et2-box>
-        <nextmatch id="nm" onselect="app.mail.mail_preview" class="" template="mail.index.rows.vertical" header_left="mail.index.add" header_right="mail.index.header_right" disable_selection_advance="true"/>
+        <template id="splitter" height="100%" template="mail.index.splitter"/>
         <iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
     </template>
 </overlay>
\ No newline at end of file