diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6ca7c21a6e4..5f0f9002e2f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -436,7 +436,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                    <field name="message_follower_ids" widget="mail_followers"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index fdd04aa1174..7611717bdc0 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -788,7 +788,7 @@ class mail_thread(osv.AbstractModel):
                 mail_message.write(cr, uid, message_ids, {'email_from': None, 'author_id': part_ids[0]}, context=context)
 
         partner_ids = set(kwargs.pop('partner_ids', [])) | set(new_partner_ids)
-        
+
         if parent_id:
             parent_message = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
             partner_ids |= set([(4, partner.id) for partner in parent_message.partner_ids])
@@ -841,7 +841,12 @@ class mail_thread(osv.AbstractModel):
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
-        self.check_access_rights(cr, uid, 'read')
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        if set(partner_ids) == set([user_pid]):
+            self.check_access_rights(cr, uid, 'read')
+        else:
+            self.check_access_rights(cr, uid, 'write')
+        
         self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
         # if subtypes are not specified (and not set to a void list), fetch default ones
         if subtype_ids is None:
@@ -863,8 +868,8 @@ class mail_thread(osv.AbstractModel):
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers. """
-        user_pids = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id']
-        if set(partner_ids) == set(user_pids):
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        if set(partner_ids) == set([user_pid]):
             self.check_access_rights(cr, uid, 'read')
         else:
             self.check_access_rights(cr, uid, 'write')
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8c8bb170453..b7592fd8b33 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1587,6 +1587,10 @@ openerp.mail = function (session) {
             }
 
             this.domain = this.node.params && this.node.params.domain || [];
+            
+            if (!this.__parentedParent.is_action_enabled('edit')) {
+                this.node.params.show_link = false;
+            }
         },
 
         start: function () {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 584fd94662c..df4f36544c9 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -19,7 +19,7 @@
         </t>
         <div class='oe_follower_title_box'>
             <h4 class='oe_follower_title'>Followers</h4>
-            <a t-if="widget.view_is_editable" href='#' class="oe_invite">Invite others</a>
+            <a t-if="widget.view_is_editable" href='#' class="oe_invite">Add others</a>
         </div>
         <div class="oe_follower_list"></div>
     </div>