diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index e566c25a6..43bba7a2c 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -6,7 +6,7 @@
    xmlns:rsrc="OGo:url"
    xmlns:label="OGo:label"
    xmlns:uix="OGo:uix">
-    <md-content md-scroll-y="md-scroll-y" flex="33" id="messagesList">
+    <md-content md-scroll-y="md-scroll-y" class="md-padding" flex="flex" id="messagesList">
       <md-list data-vs-repeat="56"
                data-vs-scroll-parent="#messagesList">
         <md-item ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
@@ -24,5 +24,7 @@
         </md-item>
       </md-list>
     </md-content>
-    <md-content flex="66" data-ui-view="message"><!-- message view --></md-content>
+
+    <md-content class="md-padding" flex="66" data-ui-view="message"><!-- message view --></md-content>
+
 </container>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 75a5a37f3..cbcca1c35 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -269,6 +269,7 @@
 
     <main layout="column" layout-fill="layout-fill">
       <md-toolbar layout="row" layout-align="space-between start" class="md-tall md-warn">
+        <!--fixme : md-toolbar-tools height is inconsistently defined, in former version it was 64px (basic toolbar height), here it's 100% -->
         <div class="md-toolbar-tools">
           <span flex="flex">
             <md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md"><span class="icon-ic_menu_24px"></span></md-button>
@@ -276,12 +277,12 @@
               [[Calendar]]
             </div>
           </span>
-          <span class="sd-toolbar">
+          <span class="sd-toolbar-tools">
             <span>search</span>
           </span>
         </div>
       </md-toolbar>
-      <md-content layout="row" flex="flex" class="md-padding" ui-view="mailbox"><!-- messages list --></md-content>
+      <md-content layout="row" flex="flex" ui-view="mailbox"><!-- messages list --></md-content>
     </main>
   </script>