diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b4b8e982845..b978a83e658 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,6 +59,7 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
+        'mail_hr_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 467f34f708b..590e8a52fa8 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -23,6 +23,8 @@ from openerp import addons
 import logging
 from openerp.osv import fields, osv
 from openerp import tools
+from openerp.tools.translate import _
+
 _logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
@@ -264,6 +266,45 @@ class hr_employee(osv.osv):
         image_path = addons.get_module_resource('hr', 'static/src/img', 'default_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
+
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """Overwrite the message_post method when using the send to my
+        followers screen
+
+        When a message is sent to a hr.employee using the action
+        action_mail_inbox_feeds, the context is extended with res_users_id
+        containing the user id of the user linked to the employee and
+        default_res_id contains 0 (to avoid misused of the function called from
+        the inbox page).
+        In these conditions, the thread_id used to send the message is the id
+        of the employee instead of the res_users (or partner_id).
+        If several employee are linked to the same user_id, the message is
+        duplicated and sent to every user.
+
+        :return: the result of message_post from mail_thread, last call if
+        several messages are sent.
+        """
+        if 'res_users_id' in context:  # and context['default_res_id'] == 0:
+            employee_ids = self.search(cr, uid, [('user_id', '=', context['res_users_id'])], context=context)
+            if len(employee_ids) > 0:
+                for employee_id in employee_ids:
+                    res = super(hr_employee, self).message_post(cr, uid, employee_id, context=context, **kwargs)
+                return res
+            else:
+                raise osv.except_osv(_('Warning!'), _('Your user is not linked to an employee form, which is required to send messages to your followers.'))
+
+        # if no overwrite, send message as usual
+        return super(hr_employee, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+
     _defaults = {
         'active': 1,
         'image': _get_default_image,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e0c3edfdb39..9d08627b3b2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,6 +27,10 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+                            <label for="work_email" class="oe_edit_only"/>
+                            <field name="work_email" widget="email"/>
+                            <label for="work_phone" class="oe_edit_only"/>
+                            <field name="work_phone"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -36,8 +40,6 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>
@@ -136,6 +138,7 @@
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
+                <field name="message_is_follower"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -154,10 +157,15 @@
                                     </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
-                                    <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                    <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
+                                <div class="oe_followers">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
+                                        <span class="oe_unfollow">Unfollow</span>
+                                        <span class="oe_following">Following</span>
+                                    </button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
+                                </div>
                             </div>
                         </div>
                         <script>
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
new file mode 100644
index 00000000000..777eeba02ae
--- /dev/null
+++ b/addons/hr/mail_hr_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
+            <field name="context">{
+              'default_model': 'hr.employee', 
+              'default_res_id': uid,
+              'res_users_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('to_read', '=', True),
+                  ('starred', '=', False),
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read',
+                'show_compose_message': True
+            }&quot;"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 16657394736..951ec4d02e3 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -68,3 +68,8 @@
   margin: 2px 0;
   padding: 0;
 }
+
+.openerp .oe_employee_vignette .oe_followers {
+  width: auto;
+  float: none;
+}
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 75c86e4645d..94af7459e7f 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -16,7 +16,8 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read'
+                'read_action': 'read',
+                'show_compose_message': False
             }&quot;"/>
             <field name="help" type="html">
                 <p>