diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b4e8ddee439..b61477ec7ca 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -157,18 +157,17 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def read_followers_data(self, cr, uid, follower_ids, context=None):
-        datas = []
+        result = []
         technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
         for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context):
-            is_editable = uid in map(lambda x:x.id, technical_group.users)
-            is_uid = uid in map(lambda x:x.id, follower.user_ids)
-            data = (
-                     follower.id,
-                     follower.name,
-                     {'is_editable': is_editable, 'is_uid': is_uid},
-            )
-            datas.append(data)
-        return datas
+            is_editable = uid in map(lambda x: x.id, technical_group.users)
+            is_uid = uid in map(lambda x: x.id, follower.user_ids)
+            data = (follower.id,
+                    follower.name,
+                    {'is_editable': is_editable, 'is_uid': is_uid},
+                    )
+            result.append(data)
+        return result
 
     def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 2554538a104..c6f7c911f8a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -632,14 +632,10 @@
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
-    margin-right: 8px;
+    margin-right: 24px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin-right: 10px;
-}
-.openerp .oe_followers .oe_partner_name {
-    margin-right: 26px;
 }
 .openerp .oe_followers .oe_partner img{
     width: 32px;
@@ -656,11 +652,9 @@
     cursor: pointer;
     position: absolute;
     right: 12px;
-    margin-top: 6px;
-    width: 10px !important;
-    height: 12px !important;
+    line-height: 20px;
 }
-.openerp .oe_followers .oe_partner img.hidden{
+.openerp .oe_followers .oe_partner .oe_hidden{
     display: none;
 }
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
deleted file mode 100644
index 6e9aa5ef659..00000000000
Binary files a/addons/mail/static/src/img/icon-edit.gif and /dev/null differ
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d40c000f53e..a0dad1fcdbc 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -169,6 +169,7 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.value, pid) != -1);
             }).then(self.proxy('display_generic'));
         },
+
         _format_followers: function(count){
             var str = '';
             if(count <= 0){
@@ -180,6 +181,7 @@ openerp_mail_followers = function(session, mail) {
             }
             return str;
         },
+
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
@@ -198,15 +200,22 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                if (record.length < 3) { return; }
-                if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
-                record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                partner = {
+                    'id': record[0],
+                    'name': record[1],
+                    'is_uid': record[2]['is_uid'],
+                    'is_editable': record[2]['is_editable'],
+                    'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
+                }
+                if (partner.is_uid) {
+                    self.message_is_follower = partner.is_uid;
+                }
+                $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-                if (record[2].is_editable == true) {
-                    self.$el.find('div.oe_follower_list').on('mouseenter mouseleave', function(e) {
-                        self.$el.find('img.oe_edit_subtype').toggleClass('hidden', e.type == 'mouseleave');
-                        self.$el.find('div.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                if (partner.is_editable) {
+                    self.$('.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$('.oe_edit_subtype').toggleClass('oe_hidden', e.type == 'mouseleave');
+                        self.$('.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
                     });
                 }
             });
@@ -233,23 +242,27 @@ openerp_mail_followers = function(session, mail) {
         /** Fetch subtypes, only if current user is follower */
         fetch_subtypes: function (user_pid) {
             var self = this;
-            var mode = "";
+            var dialog = false;
             if (user_pid) {
-                mode = "edit_follower";
+                dialog = true;
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
             this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id, mode);});
+                .then(function (data) {self.display_subtypes(data, id, dialog);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id, mode) {
+        display_subtypes:function (data, id, dialog) {
             var self = this;
-            var $list = this.$('.oe_subtype_list');
-            if (mode.length != 0){ $list = self.$dialog; }
+            if (dialog) {
+                var $list = self.$dialog;
+            }
+            else {
+                var $list = this.$('.oe_subtype_list');
+            }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             this.records_length = $.map(records, function(value, index) { return index; }).length;
@@ -257,7 +270,7 @@ openerp_mail_followers = function(session, mail) {
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( $list );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7628cdae7da..a936b8237d6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
+        <span t-if="record.is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype oe_e oe_hidden" title="Edit subscription" t-att-data-id="record.id">&amp;</span>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
     <!--
@@ -42,8 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>