diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7cee91e30e5..28a32b8c7a3 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -70,7 +70,7 @@
     width: 486px;
 }
 
-.openerp div.oe_mail_msg_content li {
+.openerp div.oe_mail_msg_content > li {
     float: left;
     margin-right: 3px;
 }
@@ -349,6 +349,11 @@
     color: #888;
 }
 
+.openerp .oe_mail_msg_footer li {
+  float: left;
+  margin-right: 3px;
+}
+
 .openerp .oe_mail_msg_body {
     margin-bottom: .5em;
     text-align: justify;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 16404b28594..8443c6dbf86 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -851,6 +851,14 @@ openerp.mail = function(session) {
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
             mail.ChatterUtils.bind_events(this);
+            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
+            if (! this.params.see_subscribers_options) {
+                this.$element.find('button.oe_mail_button_followers').hide(); }
+            this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); });
+            this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
+                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+            this.reinit();
         },
         
         _check_visibility: function() {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f49b7f3943..f67c4e8676f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -61,6 +61,17 @@
         <div class="oe_mail_recthread_main">
             <!-- contains the document thread -->
         </div>
+        <div class="oe_mail_recthread_aside">
+            <div class="oe_mail_recthread_actions">
+                <button type="button" class="oe_mail_button_follow">Follow</button>
+                <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
+                <button type="button" class="oe_mail_button_followers">Show followers</button>
+            </div>
+            <div class="oe_mail_recthread_followers">
+                <h4>Followers</h4>
+                <ul class="oe_mail_followers_display"></ul>
+            </div>
+        </div>
     </div>
 
     <!--
@@ -104,7 +115,7 @@
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">