diff --git a/mail_check_mailbox_size/__init__.py b/mail_check_mailbox_size/__init__.py
index cde864ba..0650744f 100644
--- a/mail_check_mailbox_size/__init__.py
+++ b/mail_check_mailbox_size/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 from . import models
diff --git a/mail_check_mailbox_size/__manifest__.py b/mail_check_mailbox_size/__manifest__.py
index 0d370de2..32956340 100644
--- a/mail_check_mailbox_size/__manifest__.py
+++ b/mail_check_mailbox_size/__manifest__.py
@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 # Copyright 2018 Lorenzo Battistini
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
 
 {
     "name": "Check mailbox size",
     "summary": "Send an email summarizing the current space used by a mailbox",
-    "version": "10.0.1.0.0",
+    "version": "11.0.1.0.0",
     "development_status": "Beta",
     "website": "https://github.com/OCA/social",
     "author": "Agile Business Group, Odoo Community Association (OCA)",
diff --git a/mail_check_mailbox_size/data/cron_data.xml b/mail_check_mailbox_size/data/cron_data.xml
index edbdcbb4..130d0e09 100644
--- a/mail_check_mailbox_size/data/cron_data.xml
+++ b/mail_check_mailbox_size/data/cron_data.xml
@@ -7,9 +7,8 @@
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model">fetchmail.server</field>
-            <field name="function">_check_mailboxes_size_cron</field>
-            <field name="args">()</field>
+            <field name="model_id" ref="fetchmail.model_fetchmail_server"/>
+            <field name="code">model._check_mailboxes_size_cron()</field>
             <!-- Active flag is set on fetchmail_server.create/write -->
             <field name="active" eval="False"/>
         </record>
diff --git a/mail_check_mailbox_size/models/__init__.py b/mail_check_mailbox_size/models/__init__.py
index b98d86e0..bb4ec554 100644
--- a/mail_check_mailbox_size/models/__init__.py
+++ b/mail_check_mailbox_size/models/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 from . import fetchmail
diff --git a/mail_check_mailbox_size/models/fetchmail.py b/mail_check_mailbox_size/models/fetchmail.py
index 348eaeb2..4a7e0f6f 100644
--- a/mail_check_mailbox_size/models/fetchmail.py
+++ b/mail_check_mailbox_size/models/fetchmail.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 from odoo import models, fields, api, _