diff --git a/addons/mail/models/mail_followers.py b/addons/mail/models/mail_followers.py
index 9377d12832b..b902231ba2e 100644
--- a/addons/mail/models/mail_followers.py
+++ b/addons/mail/models/mail_followers.py
@@ -61,11 +61,16 @@ class Followers(models.Model):
         default_subtypes = self.env['mail.message.subtype'].search([
             ('default', '=', True),
             '|', ('res_model', '=', res_model), ('res_model', '=', False)])
+        external_default_subtypes = default_subtypes.filtered(lambda subtype: not subtype.internal)
 
         if force_mode:
+            employee_pids = self.env['res.users'].sudo().search([('partner_id', 'in', partner_data.keys()), ('share', '=', False)]).mapped('partner_id').ids
             for pid, data in partner_data.iteritems():
                 if not data:
-                    partner_data[pid] = default_subtypes.ids
+                    if pid not in employee_pids:
+                        partner_data[pid] = external_default_subtypes.ids
+                    else:
+                        partner_data[pid] = default_subtypes.ids
             for cid, data in channel_data.iteritems():
                 if not data:
                     channel_data[cid] = default_subtypes.ids
diff --git a/addons/mail/tests/test_mail_followers.py b/addons/mail/tests/test_mail_followers.py
index 5ea0667d7eb..fa93370d605 100644
--- a/addons/mail/tests/test_mail_followers.py
+++ b/addons/mail/tests/test_mail_followers.py
@@ -77,6 +77,22 @@ class TestMailFollowers(TestMail):
         self.assertEqual(len(follower), 1)
         self.assertEqual(follower.subtype_ids, self.default_group_subtypes)
 
+    def test_followers_subtypes_default_internal(self):
+        mt_mg_def_int = self.env['mail.message.subtype'].create({'name': 'mt_mg_def', 'default': True, 'res_model': 'mail.channel', 'internal': True})
+        self.group_pigs.message_subscribe_users(user_ids=[self.user_employee.id])
+        follower = self.env['mail.followers'].search([
+            ('res_model', '=', 'mail.channel'),
+            ('res_id', '=', self.group_pigs.id),
+            ('partner_id', '=', self.user_employee.partner_id.id)])
+        self.assertEqual(follower.subtype_ids, self.default_group_subtypes | mt_mg_def_int)
+
+        self.group_pigs.message_subscribe_users(user_ids=[self.user_portal.id])
+        follower = self.env['mail.followers'].search([
+            ('res_model', '=', 'mail.channel'),
+            ('res_id', '=', self.group_pigs.id),
+            ('partner_id', '=', self.user_portal.partner_id.id)])
+        self.assertEqual(follower.subtype_ids, self.default_group_subtypes)
+
     def test_followers_subtypes_specified(self):
         self.group_pigs.sudo(self.user_employee).message_subscribe_users(subtype_ids=[self.mt_mg_nodef.id])
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('partner_id'), self.user_employee.partner_id)