diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 0f9ce981752..f74ea3b54f7 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -74,49 +74,7 @@
                 </tree>
             </field>
         </record>
-        
-        <!-- Moved this view analytic module-->
 
-       <!-- <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Account" version="7.0">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name" colspan="4"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Account Data">
-                            <group>
-                                <group string="Contacts">
-                                    <field name="partner_id"/>
-                                    <field name="user_id"/>
-                                </group>
-                                <group name="contract" string="Contract Data">
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                    <field name="quantity_max"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Description">
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>-->
 
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b1b6c68e4cc..5e025c4b5f8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,9 +68,14 @@ class mail_thread(osv.osv):
             res[id] = self.message_load_ids(cr, uid, [id], context=context)
         return res
 
+    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
+        msg_obj = self.pool.get('mail.message')
+        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
+        return [('id', 'in', msg_ids)]
+
     # OpenChatter: message_ids is a dummy field that should not be used
     _columns = {
-        'message_ids': fields.function(_get_message_ids, method=True,
+        'message_ids': fields.function(_get_message_ids, method=True, fnct_search=_search_message_ids,
                         type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
     }
 
diff --git a/addons/project/project.py b/addons/project/project.py
index f7ccf0fdeb8..d68e5ab589d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -70,23 +70,6 @@ class project(osv.osv):
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
-        for project_id in self.browse(cr, uid, ids, context):
-           if vals.get('members'):
-               members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
-           else:
-               members = project_id.members or False
-           select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
-           if select=='follower' and members:
-               member_list = [member.id for member in members]
-               followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
-               for member_id in member_list:
-                   if not member_id in followers:
-                      self.message_subscribe(cr, uid, ids, [member_id], context=context)
-        return super(project, self).write(cr, uid, ids, vals, context=context)
-
     def _complete_name(self, cr, uid, ids, name, args, context=None):
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
@@ -182,6 +165,23 @@ class project(osv.osv):
             res[task.project_id.id] += 1
         return res
 
+    def _get_followers(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Functional field that computes the users that are 'following' a thread.
+        '''
+        res = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            l = set()
+            for message in project.message_ids:
+                l.add(message.user_id and message.user_id.id or False)
+            res[project.id] = list(filter(None, l))
+        return res
+
+    def _search_followers(self, cr, uid, obj, name, args, context=None):
+        project_obj = self.pool.get('project.project')
+        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
+        return [('id', 'in', project_ids)]
+
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
@@ -220,21 +220,15 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
+        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
+                        type='many2many', relation='res.users', string='Followers'),
      }
     
     def dummy(self, cr, uid, ids, context):
         return True
 
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        followers = super(project,self).message_thread_followers(cr, uid, ids, context=context)
-        for project in self.browse(cr, uid, followers.keys(), context=context):
-            project_followers = set(followers[project.id])
-            project_followers.add(project.user_id.user_email)
-            followers[project.id] = filter(None, project_followers)
-        return followers
-
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -1261,7 +1255,7 @@ class account_analytic_account(osv.osv):
         '''
         project_pool = self.pool.get('project.project')
         project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
-        if not project_id and self._trigger_project_creation(vals):
+        if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
             project_values = {
                 'name': vals.get('name'),
                 'analytic_account_id': analytic_account_id,
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index ba2d07ef93a..829ec6c6971 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -45,7 +45,7 @@
         <field name="name">public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('privacy_visility','in',[False,'public']),('members','in',[user.id])]</field>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index c7f72d04e32..976a706ac54 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -607,7 +607,6 @@ class project(osv.osv):
 project()
 
 class account_analytic_account(osv.osv):
-
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     
@@ -615,8 +614,8 @@ class account_analytic_account(osv.osv):
         'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
     }
     
-    def _trigger_project_creation(vals):
-        res = super(account_analytic_account, self)._trigger_project_creation(vals)
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_issues')
 
 account_analytic_account()
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 7e50e9a6793..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -276,8 +276,8 @@ class account_analytic_account(osv.osv):
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
 
-    def _trigger_project_creation(vals):
-        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_phases')
 
 account_analytic_account()