diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 5cb5c2df67..601efe2005 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -4,7 +4,7 @@
 <overlay>
 	<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
 		<vbox class="mailCompose mailComposeHeaderSection" width="100%">
-			<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false"/>
+			<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false" list_header="short"/>
 			<hbox class="mail-compose_toolbar_assist" width="100%">
 				<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" dialog_title="Attach files" button_label="attach" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
 				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 7b127ca3b6..d18412e586 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -6,7 +6,7 @@
         <appicon class="onlyPrint"/>
         <html id="msg"/>
         <vbox class="mailDisplay">
-            <toolbar id="displayToolbar" width="100%" view_range="6" flat_list="true"/>
+            <toolbar id="displayToolbar" width="100%" view_range="6" flat_list="true" list_header="short"/>
             <hbox>
                 <hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM">
                     <description value="From"/>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 8610c38458..e3e77f8ae2 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -6,7 +6,7 @@
 		<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"/>
 			<old-vbox id="mailPreview" width="100%">
-                <toolbar id="toolbar"/>
+                <toolbar id="toolbar" list_header="short"/>
                 <old-box id="blank" disabled="false">
                     <image src="mail"/>
                     <description value="Select an item to read"/>
