diff --git a/mail_follower_custom_notification/models/mail_followers.py b/mail_follower_custom_notification/models/mail_followers.py
index e44b2018..e36ac17c 100644
--- a/mail_follower_custom_notification/models/mail_followers.py
+++ b/mail_follower_custom_notification/models/mail_followers.py
@@ -25,28 +25,52 @@ class MailFollowers(models.Model):
     @api.model
     def create(self, values):
         this = super(MailFollowers, self).create(values)
-        for subtype in this.subtype_ids:
+        this._mail_follower_custom_notification_update()
+        return this
+
+    @api.multi
+    def _mail_follower_custom_notification_update(self, subtypes=None):
+        self.ensure_one()
+        for subtype in subtypes or self.subtype_ids:
             if not subtype.res_model and\
                     subtype.custom_notification_model_ids and\
-                    this.res_model not in\
+                    self.res_model not in\
                     subtype.custom_notification_model_ids\
                         .mapped('model'):
                 continue
             user = self.env['res.users'].search([
-                ('partner_id', '=', this.partner_id.id),
+                ('partner_id', '=', self.partner_id.id),
             ], limit=1)
             is_employee = user and user.has_group('base.group_user')
             if subtype.custom_notification_mail == 'force_yes':
-                this.force_mail_subtype_ids |= subtype
+                self.force_mail_subtype_ids |= subtype
             if subtype.custom_notification_mail == 'force_no':
-                this.force_nomail_subtype_ids |= subtype
+                self.force_nomail_subtype_ids |= subtype
             if is_employee:
                 if subtype.custom_notification_mail_employees == 'force_yes':
-                    this.force_mail_subtype_ids |= subtype
-                    this.force_nomail_subtype_ids -= subtype
+                    self.force_mail_subtype_ids |= subtype
+                    self.force_nomail_subtype_ids -= subtype
                 if subtype.custom_notification_mail_employees == 'force_no':
-                    this.force_mail_subtype_ids -= subtype
-                    this.force_nomail_subtype_ids |= subtype
+                    self.force_mail_subtype_ids -= subtype
+                    self.force_nomail_subtype_ids |= subtype
             if subtype.custom_notification_own:
-                this.force_own_subtype_ids |= subtype
-        return this
+                self.force_own_subtype_ids |= subtype
+
+    @api.multi
+    def write(self, values):
+        result = super(MailFollowers, self).write(values)
+        if 'subtype_ids' in values:
+            for this in self:
+                subtypes = self.env['mail.message.subtype'].browse(
+                    filter(
+                        None,
+                        map(
+                            lambda x: x.get('id'),
+                            this.resolve_2many_commands(
+                                'subtype_ids', values['subtype_ids'],
+                            ),
+                        )
+                    )
+                )
+                this._mail_follower_custom_notification_update(subtypes)
+        return result