diff --git a/addons/fetchmail/models/fetchmail.py b/addons/fetchmail/models/fetchmail.py
index d04641bb450..62334f45562 100644
--- a/addons/fetchmail/models/fetchmail.py
+++ b/addons/fetchmail/models/fetchmail.py
@@ -160,7 +160,7 @@ class FetchmailServer(models.Model):
         MailThread = self.env['mail.thread']
         for server in self:
             _logger.info('start checking for new emails on %s server %s', server.server_type, server.name)
-            additionnal_context['fetchmail_server_id'] = server.id
+            additionnal_context['default_fetchmail_server_id'] = server.id
             additionnal_context['server_type'] = server.server_type
             count, failed = 0, 0
             imap_server = None
diff --git a/addons/fetchmail/models/mail_mail.py b/addons/fetchmail/models/mail_mail.py
index 66a9154af70..79f47d8dd12 100644
--- a/addons/fetchmail/models/mail_mail.py
+++ b/addons/fetchmail/models/mail_mail.py
@@ -1,25 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class MailMail(models.Model):
-
-    _inherit = "mail.mail"
+    _inherit = 'mail.mail'
 
     fetchmail_server_id = fields.Many2one('fetchmail.server', "Inbound Mail Server", readonly=True, index=True, oldname='server_id')
-
-    @api.model
-    def create(self, values):
-        fetchmail_server_id = self.env.context.get('fetchmail_server_id')
-        if fetchmail_server_id:
-            values['fetchmail_server_id'] = fetchmail_server_id
-        return super(MailMail, self).create(values)
-
-    @api.multi
-    def write(self, values):
-        fetchmail_server_id = self.env.context.get('fetchmail_server_id')
-        if fetchmail_server_id:
-            values['fetchmail_server_id'] = fetchmail_server_id
-        return super(MailMail, self).write(values)