diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 1592d79e18d..0f1f90d04fb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -143,12 +143,12 @@
 /* subtypes
 /* ------------------------------------------------------------ */
 
-.openerp .oe_mouse_subtypes {
+.openerp .oe_mail_subtypes {
     display:inline-block;
     position: relative;
     z-index: 5;
 }
-.openerp .oe_mouse_subtypes .oe_recthread_subtypes {
+.openerp .oe_mail_subtypes .oe_recthread_subtypes {
     background: #fff;
     padding: 2px;
     border: 1px solid #aaaaaa;
@@ -156,10 +156,10 @@
     position: absolute;
     z-index: 2;
 }
-.openerp .oe_mouse_subtypes.oe_mouseout .oe_recthread_subtypes {
+.openerp .oe_mail_subtypes.oe_mouseout .oe_recthread_subtypes {
     display: none;
 }
-.openerp .oe_mouse_subtypes.oe_mouseover .oe_recthread_subtypes {
+.openerp .oe_mail_subtypes.oe_mouseover .oe_recthread_subtypes {
     display: block;
 }
 
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 236e3081136..0dd3aef5571 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -26,7 +26,6 @@ openerp_mail_followers = function(session, mail) {
             this._super.apply(this, arguments);
             this.options.image = this.node.attrs.image || 'image_small';
             this.options.title = this.node.attrs.title || 'Followers';
-            this.options.context = this.node.attrs.context;
             this.options.comment = this.node.attrs.help || false;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.sub_model = new session.web.DataSetSearch(this,'mail.message.subtype');
@@ -55,16 +54,14 @@ openerp_mail_followers = function(session, mail) {
         bind_events: function() {
             var self = this;
             this.$('button.oe_follower')
-                .on('click', function () {
+                .on('click', function (event) {
                     if($(this).hasClass('oe_notfollow'))
                         self.do_follow();
                     else
                         self.do_unfollow();
                 });
-
-            this.$el.on('click', 'ul.oe_subtypes input', self.do_update_subscription );
-
-            this.$el.on('click', 'button.oe_invite', function(event) {
+            this.$('ul.oe_subtypes input').on('click', self.do_update_subscription);
+            this.$('button.oe_invite').on('click', function (event) {
                 action = {
                     type: 'ir.actions.act_window',
                     res_model: 'mail.wizard.invite',
@@ -93,23 +90,13 @@ openerp_mail_followers = function(session, mail) {
             return this.fetch_followers(value_  || this.get_value());
         },
 
-        set_is_follower: function(value_) {
-            for(var i in value_){
-                if(value_[i]['user_ids'][0]==this.session.uid)
-                    this.message_is_follower=true;
-                    this.display_buttons();
-                    return true;
-            }
-            this.message_is_follower=false;
-            this.display_buttons();
-            return false;
-        },
-
         fetch_followers: function (value_) {
             this.value = value_ || {};
             this.message_is_follower = (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
             if(value_)
-                return this.ds_follow.call('read', [this.value, ['name', 'user_ids']]).pipe(this.proxy('display_followers'), this.proxy('display_generic'));
+                return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
+                    .pipe(this.proxy('display_followers'), this.proxy('display_generic'))
+                    .pipe(this.proxy('display_buttons'));
         },
 
         /* Display generic info about follower, for people not having access to res_partner */
@@ -125,8 +112,6 @@ openerp_mail_followers = function(session, mail) {
                 content += ' (' + this.value.length + ')'
             }
             this.$('div.oe_mail_recthread_followers h4').html(content);
-            this.display_buttons();
-            return $.when();
         },
 
         /** Display the followers, evaluate is_follower directly */
@@ -142,6 +127,17 @@ openerp_mail_followers = function(session, mail) {
             self.set_is_follower(records);
         },
 
+        /** Computes whether the current user is in the followers */
+        set_is_follower: function(value_) {
+            this.message_is_follower = false;
+            for(var i in value_) {
+                if (value_[i]['user_ids'][0] == this.session.uid) {
+                    this.message_is_follower = true;
+                    return true;
+                }
+            }
+        },
+
         display_buttons: function () {
             if (this.message_is_follower) {
                 this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
@@ -149,7 +145,7 @@ openerp_mail_followers = function(session, mail) {
             else {
                 this.$('button.oe_follower').removeClass('oe_following').addClass('oe_notfollow');
             }
-            
+
             if (this.view.is_action_enabled('edit'))
                 this.$('span.oe_mail_invite_wrapper').hide();
             else
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index f78c91c6305..87b49579100 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -7,7 +7,7 @@
         -->
     <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
-            <div class="oe_mouse_subtypes">
+            <div class="oe_mail_subtypes">
                 <button type="button" class="oe_follower oe_notfollow">
                     <span class="oe_follow">Follow</span>
                     <span class="oe_unfollow">Unfollow</span>
@@ -18,11 +18,9 @@
                 <ul class="oe_subtypes"></ul>
             </div>
         </div>
-        <div class="oe_grey">
-            <t t-if="widget.options.comment">
-                <h5><t t-raw="widget.options.comment"/></h5>
-            </t>
-        </div>
+        <t t-if="widget.options.comment">
+            <h5 class="oe_grey"><t t-raw="widget.options.comment"/></h5>
+        </t>
         <div class="oe_mail_recthread_followers">
             <button type="button" class="oe_invite"><span>Invite</span></button>
             <t t-if="widget.options.title">