diff --git a/mail_log_messages_to_process/README.rst b/mail_log_message_to_process/README.rst
similarity index 83%
rename from mail_log_messages_to_process/README.rst
rename to mail_log_message_to_process/README.rst
index c46bf2ebd..33c22cbb0 100644
--- a/mail_log_messages_to_process/README.rst
+++ b/mail_log_message_to_process/README.rst
@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-============================
-Mail log messages to process
-============================
+===========================
+Mail log message to process
+===========================
 
 This module allows to log into the server the basic information of emails
 that have been fetched from the mail server, before they start to be processed.
@@ -14,6 +14,9 @@ missing in Odoo. Can help to better resolve questions of the type 'Was it that
 the email was never fetched, or a problem found when it was processed by
 Odoo?'.
 
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+    :alt: Try me on Runbot
+    :target: https://runbot.odoo-community.org/runbot/149/10.0
 
 Bug Tracker
 ===========
diff --git a/mail_log_messages_to_process/__init__.py b/mail_log_message_to_process/__init__.py
similarity index 60%
rename from mail_log_messages_to_process/__init__.py
rename to mail_log_message_to_process/__init__.py
index b33ed7e33..149f4e4fd 100644
--- a/mail_log_messages_to_process/__init__.py
+++ b/mail_log_message_to_process/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L. (www.eficent.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from . import models
diff --git a/mail_log_messages_to_process/__openerp__.py b/mail_log_message_to_process/__manifest__.py
similarity index 87%
rename from mail_log_messages_to_process/__openerp__.py
rename to mail_log_message_to_process/__manifest__.py
index 6a0392dc3..4ede8aea1 100644
--- a/mail_log_messages_to_process/__openerp__.py
+++ b/mail_log_message_to_process/__manifest__.py
@@ -3,8 +3,8 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'Mail Log Messages to Process',
-    'version': '9.0.1.0.0',
+    'name': 'Mail Log Message to Process',
+    'version': '10.0.1.0.0',
     'category': 'Tools',
     'summary': 'Log all messages received, before they start to be processed.',
     'author': "Eficent, "
diff --git a/mail_log_messages_to_process/i18n/ca.po b/mail_log_message_to_process/i18n/ca.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/ca.po
rename to mail_log_message_to_process/i18n/ca.po
diff --git a/mail_log_messages_to_process/i18n/de.po b/mail_log_message_to_process/i18n/de.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/de.po
rename to mail_log_message_to_process/i18n/de.po
diff --git a/mail_log_messages_to_process/i18n/es.po b/mail_log_message_to_process/i18n/es.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/es.po
rename to mail_log_message_to_process/i18n/es.po
diff --git a/mail_log_messages_to_process/i18n/fr.po b/mail_log_message_to_process/i18n/fr.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/fr.po
rename to mail_log_message_to_process/i18n/fr.po
diff --git a/mail_log_messages_to_process/i18n/it.po b/mail_log_message_to_process/i18n/it.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/it.po
rename to mail_log_message_to_process/i18n/it.po
diff --git a/mail_log_messages_to_process/i18n/mail_log_messages_to_process.pot b/mail_log_message_to_process/i18n/mail_log_message_to_process.pot
similarity index 100%
rename from mail_log_messages_to_process/i18n/mail_log_messages_to_process.pot
rename to mail_log_message_to_process/i18n/mail_log_message_to_process.pot
diff --git a/mail_log_messages_to_process/i18n/pt_BR.po b/mail_log_message_to_process/i18n/pt_BR.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/pt_BR.po
rename to mail_log_message_to_process/i18n/pt_BR.po
diff --git a/mail_log_messages_to_process/i18n/pt_PT.po b/mail_log_message_to_process/i18n/pt_PT.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/pt_PT.po
rename to mail_log_message_to_process/i18n/pt_PT.po
diff --git a/mail_log_messages_to_process/i18n/sl.po b/mail_log_message_to_process/i18n/sl.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/sl.po
rename to mail_log_message_to_process/i18n/sl.po
diff --git a/mail_log_messages_to_process/i18n/tr.po b/mail_log_message_to_process/i18n/tr.po
similarity index 100%
rename from mail_log_messages_to_process/i18n/tr.po
rename to mail_log_message_to_process/i18n/tr.po
diff --git a/mail_log_messages_to_process/models/__init__.py b/mail_log_message_to_process/models/__init__.py
similarity index 61%
rename from mail_log_messages_to_process/models/__init__.py
rename to mail_log_message_to_process/models/__init__.py
index e13071783..89b259c6c 100644
--- a/mail_log_messages_to_process/models/__init__.py
+++ b/mail_log_message_to_process/models/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L. (www.eficent.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from . import mail_thread
diff --git a/mail_log_messages_to_process/models/mail_thread.py b/mail_log_message_to_process/models/mail_thread.py
similarity index 94%
rename from mail_log_messages_to_process/models/mail_thread.py
rename to mail_log_message_to_process/models/mail_thread.py
index 63f805ff9..a18110f50 100644
--- a/mail_log_messages_to_process/models/mail_thread.py
+++ b/mail_log_message_to_process/models/mail_thread.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L. (www.eficent.com)
+# Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
+#           (www.eficent.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
 import email
 import xmlrpclib
 import logging
 from email.message import Message
-from openerp import api, models
-from openerp.addons.mail.models.mail_message import decode
+from odoo import api, models
+from odoo.tools import decode_smtp_header as decode
 
 _logger = logging.getLogger(__name__)
 
diff --git a/mail_log_messages_to_process/static/description/icon.png b/mail_log_message_to_process/static/description/icon.png
similarity index 100%
rename from mail_log_messages_to_process/static/description/icon.png
rename to mail_log_message_to_process/static/description/icon.png