diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index be3df528510..a3c3425f305 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -21,7 +21,11 @@
     border-radius: 2px;
     border: solid 1px #ececec;
     margin-bottom: 4px;
-    min-height: 75px;
+    min-height: 44px;
+}
+.openerp .oe_mail .oe_msg:not(.oe_lvl_0){
+    background: #eeecfc;
+    border: solid 1px #eee5ff;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
@@ -40,7 +44,7 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_right{
     float: right;
-    background: yellow;
+    height: 24px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     height: 32px;
@@ -52,11 +56,16 @@
     overflow: hidden;
     padding: 4px;
 }
-.openerp .oe_mail .oe_msg .oe_msg_icons a{
-    text-decoration: none;
-    display: block;
+.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons span{
+    float:right;
+    width:24px;
+    height:24px;
+    line-height:24px;
     text-align: center;
 }
+.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons a{
+    text-decoration: none;
+}
 .openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
     height: 100%;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 24946a6fd81..e49811ab38c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -886,7 +886,7 @@ openerp.mail = function(session) {
             }
 
             this.messages = [];
-            this.ComposeMessage = false;
+            this.composeMessage = false;
 
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
@@ -902,18 +902,18 @@ openerp.mail = function(session) {
 
         instantiate_ComposeMessage: function(){
             // add message composition form view
-            this.ComposeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
+            this.composeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
                 'context': this.context,
                 'options': this.options,
             });
 
             if(this.datasets.thread_level){
-                this.ComposeMessage.appendTo(this.$el);
+                this.composeMessage.appendTo(this.$el);
             } else {
                 // root view
-                this.ComposeMessage.prependTo(this.$el);
+                this.composeMessage.prependTo(this.$el);
             }
-            this.ComposeMessage.do_hide_compact();
+            this.composeMessage.do_hide_compact();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1030,7 +1030,7 @@ openerp.mail = function(session) {
         /* this function is launch when a user click on "Reply" button
         */
         on_compose_message: function(){
-            this.ComposeMessage.on_compose_expandable();
+            this.composeMessage.on_compose_expandable();
         },
 
         /* display the no message on the thread
@@ -1102,7 +1102,7 @@ openerp.mail = function(session) {
             var self=this;
 
             if(this.datasets.show_composeform){
-                this.ComposeMessage.do_show_compact();
+                this.composeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
@@ -1412,7 +1412,7 @@ openerp.mail = function(session) {
 
         bind_events: function(){
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_full:first").click(function(){ self.root.thread.composeMessage.on_compose_fullmail(); });
             this.$("button.oe_write_onwall:first").click(function(){ self.root.thread.on_compose_message(); });
         }
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f6e69bc0ac8..39cd5bbce38 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,14 +185,14 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_lvl_#{widget.datasets.thread_level} oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
+                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
                 </div>
             </div>
 
@@ -279,6 +279,6 @@
         Template used to display stared/unstared message in a mail.message
     -->
     <t t-name="mail.thread.message.star">
-         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+        <span><a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a></span>
     </t>
 </template>