diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6e7310ac905..bbf68f7711c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -769,7 +769,7 @@ openerp.mail = function(session) {
 
             // if this message is read, all childs message display is read
             this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){
-                self.$el.removeClass(this.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
+                self.$el.removeClass(self.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
                 self.to_read = !self.to_read;
             });
             return false;
@@ -934,7 +934,7 @@ openerp.mail = function(session) {
             this.thread_level =  (datasets.thread_level+1) || 0,
             this.partner_ids =  _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
             this.messages = [];
-            this.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;
+            this.show_compose_message = this.options.show_compose_message && (this.options.show_reply_button > this.thread_level || !this.thread_level);
 
             // object compose message
             this.ComposeMessage = false;
@@ -1464,7 +1464,7 @@ openerp.mail = function(session) {
             this.thread.no_message();
             this.thread.message_fetch();
 
-            if(this.options.show_compose_message){
+            if(this.options.show_compose_message && this.thread.ComposeMessage){
                 this.thread.ComposeMessage.do_show_compact();
             }
         },
@@ -1535,7 +1535,7 @@ openerp.mail = function(session) {
                 'context' : this.options.context,
                 'typeof_thread': this.options.context['typeof_thread'] || 'other',
                 'display_indented_thread': -1,
-                'show_reply_button': 10,
+                'show_reply_button': 0,
                 'show_read_unread_button': -1,
                 'show_compose_message': show_compose_message
                 }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a4fbaa71305..1d5f3a9e239 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -184,7 +184,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_lvl_#{widget.thread_level} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
 
             <div class='oe_msg_left'>
                 <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">