diff --git a/addons/fetchmail/models/fetchmail.py b/addons/fetchmail/models/fetchmail.py
index ef2b7b92df3..67dce8c145b 100644
--- a/addons/fetchmail/models/fetchmail.py
+++ b/addons/fetchmail/models/fetchmail.py
@@ -153,7 +153,6 @@ odoo_mailgate: "|/path/to/odoo-mailgate.py --host=localhost -u %(uid)d -p PASSWO
         for server in self:
             _logger.info('start checking for new emails on %s server %s', server.server_type, server.name)
             additionnal_context['default_fetchmail_server_id'] = server.id
-            additionnal_context['server_type'] = server.server_type
             count, failed = 0, 0
             imap_server = None
             pop_server = None
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 60cbf956620..ae5d1c961f3 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -7,10 +7,10 @@ import re
 from binascii import Error as binascii_error
 from collections import defaultdict
 from operator import itemgetter
-from odoo.http import request
 
 from odoo import _, api, fields, models, modules, tools
 from odoo.exceptions import UserError, AccessError
+from odoo.http import request
 from odoo.osv import expression
 from odoo.tools import groupby
 
@@ -26,8 +26,6 @@ class Message(models.Model):
     _order = 'id desc'
     _rec_name = 'record_name'
 
-    _message_read_limit = 30
-
     @api.model
     def _get_default_from(self):
         if self.env.user.email: