diff --git a/mass_mailing_partner/README.rst b/mass_mailing_partner/README.rst
index 2396a5a03..0eb1d089a 100644
--- a/mass_mailing_partner/README.rst
+++ b/mass_mailing_partner/README.rst
@@ -14,13 +14,13 @@ Link partners with mass-mailing
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
-    :target: https://github.com/OCA/social/tree/12.0/mass_mailing_partner
+    :target: https://github.com/OCA/social/tree/13.0/mass_mailing_partner
     :alt: OCA/social
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_partner
+    :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_partner
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/205/12.0
+    :target: https://runbot.odoo-community.org/runbot/205/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -61,7 +61,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/social/issues/new?body=module:%20mass_mailing_partner%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20mass_mailing_partner%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -86,6 +86,7 @@ Contributors
     * David Vidal
     * Ernesto Tejeda
     * Victor M.M. Torres
+    * Manuel Calero
 
 Maintainers
 ~~~~~~~~~~~
@@ -100,6 +101,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/social <https://github.com/OCA/social/tree/12.0/mass_mailing_partner>`_ project on GitHub.
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/13.0/mass_mailing_partner>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mass_mailing_partner/__init__.py b/mass_mailing_partner/__init__.py
index 27d867f16..4f890c3e9 100644
--- a/mass_mailing_partner/__init__.py
+++ b/mass_mailing_partner/__init__.py
@@ -1,6 +1,3 @@
-# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
-# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-# Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models
diff --git a/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py
index 92bb68190..dcbac1bfb 100644
--- a/mass_mailing_partner/__manifest__.py
+++ b/mass_mailing_partner/__manifest__.py
@@ -1,11 +1,12 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015-2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     "name": "Link partners with mass-mailing",
-    "version": "12.0.1.0.2",
+    "version": "13.0.1.0.0",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/social",
     "license": "AGPL-3",
@@ -13,9 +14,9 @@
     "depends": ["mass_mailing"],
     "post_init_hook": "post_init_hook",
     "data": [
-        "views/mail_mail_statistics_view.xml",
-        "views/mail_mass_mailing_contact_view.xml",
-        "views/mail_mass_mailing_view.xml",
+        "views/mailing_trace_view.xml",
+        "views/mailing_contact_view.xml",
+        "views/mailing_view.xml",
         "views/res_partner_view.xml",
         "wizard/partner_mail_list_wizard.xml",
     ],
diff --git a/mass_mailing_partner/hooks.py b/mass_mailing_partner/hooks.py
index f2200d926..f2fe4aa60 100644
--- a/mass_mailing_partner/hooks.py
+++ b/mass_mailing_partner/hooks.py
@@ -2,6 +2,7 @@
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging
@@ -15,7 +16,7 @@ def post_init_hook(cr, registry):
     with api.Environment.manage():
         env = api.Environment(cr, SUPERUSER_ID, {})
         # ACTION 1: Match existing contacts
-        contact_model = env["mail.mass_mailing.contact"]
+        contact_model = env["mailing.contact"]
         partner_model = env["res.partner"]
         contacts = contact_model.search([("email", "!=", False)])
         _logger.info("Trying to match %d contacts to partner by email", len(contacts))
@@ -26,7 +27,7 @@ def post_init_hook(cr, registry):
             if partners:
                 contact.write({"partner_id": partners.id})
         # ACTION 2: Match existing statistics
-        stat_model = env["mail.mail.statistics"]
+        stat_model = env["mailing.trace"]
         stats = stat_model.search([("model", "!=", False), ("res_id", "!=", False)])
         _logger.info("Trying to link %d mass mailing statistics to partner", len(stats))
         stats.partner_link()
diff --git a/mass_mailing_partner/i18n/am.po b/mass_mailing_partner/i18n/am.po
index 6b4f4c4ae..76c9117b1 100644
--- a/mass_mailing_partner/i18n/am.po
+++ b/mass_mailing_partner/i18n/am.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "ተባባሪ"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/ar.po b/mass_mailing_partner/i18n/ar.po
index 6eb95546a..cdfc360e4 100644
--- a/mass_mailing_partner/i18n/ar.po
+++ b/mass_mailing_partner/i18n/ar.po
@@ -20,8 +20,8 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "أنشئ في"
 msgid "Display Name"
 msgstr "اسم العرض"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "الشريك"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/bg.po b/mass_mailing_partner/i18n/bg.po
index e6337f72f..ebf77fb03 100644
--- a/mass_mailing_partner/i18n/bg.po
+++ b/mass_mailing_partner/i18n/bg.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Създадено на"
 msgid "Display Name"
 msgstr "Име за Показване"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Партньор"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/bs.po b/mass_mailing_partner/i18n/bs.po
index f0ef67585..741febc6f 100644
--- a/mass_mailing_partner/i18n/bs.po
+++ b/mass_mailing_partner/i18n/bs.po
@@ -20,8 +20,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Kreirano"
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/ca.po b/mass_mailing_partner/i18n/ca.po
index 16d3355cf..97aa8e1f2 100644
--- a/mass_mailing_partner/i18n/ca.po
+++ b/mass_mailing_partner/i18n/ca.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Creat el"
 msgid "Display Name"
 msgstr "Veure el nom"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Estadístiques de correu electrònic"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,25 @@ msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Contactes del correu massiu"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Llista d'enviament"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Estadístiques de correu electrònic"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +122,12 @@ msgid "Mailing contacts number"
 msgstr "Contactes del correu massiu"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Contactes del correu massiu"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,35 +145,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Contactes del correu massiu"
diff --git a/mass_mailing_partner/i18n/ca_ES.po b/mass_mailing_partner/i18n/ca_ES.po
index 5eeeffae8..9b1fa3edc 100644
--- a/mass_mailing_partner/i18n/ca_ES.po
+++ b/mass_mailing_partner/i18n/ca_ES.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/cs.po b/mass_mailing_partner/i18n/cs.po
index 30d6a70cc..24cf329ae 100644
--- a/mass_mailing_partner/i18n/cs.po
+++ b/mass_mailing_partner/i18n/cs.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Vytvořeno"
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Společník"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/da.po b/mass_mailing_partner/i18n/da.po
index b44e0925b..32f26991d 100644
--- a/mass_mailing_partner/i18n/da.po
+++ b/mass_mailing_partner/i18n/da.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Oprettet den"
 msgid "Display Name"
 msgstr "Vist navn"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/de.po b/mass_mailing_partner/i18n/de.po
index 85d7f2b06..84e03ccc5 100644
--- a/mass_mailing_partner/i18n/de.po
+++ b/mass_mailing_partner/i18n/de.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Angelegt am"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Email-Statistiken"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,25 @@ msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Massenmail-Kontakt"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Mailingliste"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Email-Statistiken"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +122,12 @@ msgid "Mailing contacts number"
 msgstr "Massenmail-Kontakt"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Massenmail-Kontakt"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,35 +145,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Massenmail-Kontakt"
diff --git a/mass_mailing_partner/i18n/el_GR.po b/mass_mailing_partner/i18n/el_GR.po
index 7cbd6994c..219517047 100644
--- a/mass_mailing_partner/i18n/el_GR.po
+++ b/mass_mailing_partner/i18n/el_GR.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Δημιουργήθηκε στις"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/en_AU.po b/mass_mailing_partner/i18n/en_AU.po
index 9057dd112..5d6a176be 100644
--- a/mass_mailing_partner/i18n/en_AU.po
+++ b/mass_mailing_partner/i18n/en_AU.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/en_GB.po b/mass_mailing_partner/i18n/en_GB.po
index 4f8d63d5a..7cfc27efa 100644
--- a/mass_mailing_partner/i18n/en_GB.po
+++ b/mass_mailing_partner/i18n/en_GB.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Created on"
 msgid "Display Name"
 msgstr "Display Name"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es.po b/mass_mailing_partner/i18n/es.po
index 9693493e6..b54f0d787 100644
--- a/mass_mailing_partner/i18n/es.po
+++ b/mass_mailing_partner/i18n/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-26 01:46+0000\n"
 "PO-Revision-Date: 2018-02-26 01:46+0000\n"
-"Last-Translator: enjolras <yo@miguelrevilla.com>, 2017\n"
+"Last-Translator: Tecnativa - Manuel Calero, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
-msgstr ""
+msgstr "Un cliente no puede estar varias veces en la misma lista"
 
 #. module: mass_mailing_partner
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.partner_mail_list_wizard_form
@@ -44,7 +44,7 @@ msgstr "Cancelar"
 #. module: mass_mailing_partner
 #: model:ir.model,name:mass_mailing_partner.model_res_partner
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: mass_mailing_partner
 #: model:ir.model,name:mass_mailing_partner.model_partner_mail_list_wizard
@@ -67,11 +67,6 @@ msgstr "Creado el"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Estadísticas de email"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,25 @@ msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Contacto de envío masivo"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Lista de correo"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Estadísticas de email"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -115,19 +123,14 @@ msgid "Mailing contacts number"
 msgstr "Número de estadísticas de envío masivo"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr "Asociado obligatorio"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Contacto de envío masivo"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
-msgstr ""
+msgstr "Información de suscripción de correo masivo"
 
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_stats_ids
@@ -143,33 +146,33 @@ msgid "Mass mailing stats number"
 msgstr "Número de estadísticas de envío masivo"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Asociado"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr "El asociado '%s' no tiene email."
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr "Etiqueta del asociado"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, fuzzy, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr "El asociado ya existe en esta lista de correo."
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, fuzzy, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
@@ -178,6 +181,9 @@ msgstr ""
 "El asociado '%s' está suscrito a una o más listas de correo. Se le debe "
 "asignar un email."
 
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Contacto de envío masivo"
+
 #~ msgid "Mailing list number"
 #~ msgstr "Número de lista de correo"
 
diff --git a/mass_mailing_partner/i18n/es_AR.po b/mass_mailing_partner/i18n/es_AR.po
index b85f80960..ac0061302 100644
--- a/mass_mailing_partner/i18n/es_AR.po
+++ b/mass_mailing_partner/i18n/es_AR.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_CL.po b/mass_mailing_partner/i18n/es_CL.po
index 0afa4a245..b52ab404a 100644
--- a/mass_mailing_partner/i18n/es_CL.po
+++ b/mass_mailing_partner/i18n/es_CL.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_CO.po b/mass_mailing_partner/i18n/es_CO.po
index c1ed0069e..364ca4748 100644
--- a/mass_mailing_partner/i18n/es_CO.po
+++ b/mass_mailing_partner/i18n/es_CO.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado"
 msgid "Display Name"
 msgstr "Nombre Público"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_CR.po b/mass_mailing_partner/i18n/es_CR.po
index 33541b9f0..0926ada94 100644
--- a/mass_mailing_partner/i18n/es_CR.po
+++ b/mass_mailing_partner/i18n/es_CR.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_DO.po b/mass_mailing_partner/i18n/es_DO.po
index 8a8cc15ea..46b68cf6a 100644
--- a/mass_mailing_partner/i18n/es_DO.po
+++ b/mass_mailing_partner/i18n/es_DO.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_EC.po b/mass_mailing_partner/i18n/es_EC.po
index a799ec05d..6ee1f6a34 100644
--- a/mass_mailing_partner/i18n/es_EC.po
+++ b/mass_mailing_partner/i18n/es_EC.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_ES.po b/mass_mailing_partner/i18n/es_ES.po
index 3ccd0a173..f06b9c4c2 100644
--- a/mass_mailing_partner/i18n/es_ES.po
+++ b/mass_mailing_partner/i18n/es_ES.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_MX.po b/mass_mailing_partner/i18n/es_MX.po
index 48b5f00a9..85b39292c 100644
--- a/mass_mailing_partner/i18n/es_MX.po
+++ b/mass_mailing_partner/i18n/es_MX.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_PE.po b/mass_mailing_partner/i18n/es_PE.po
index 674ef8605..f253131e5 100644
--- a/mass_mailing_partner/i18n/es_PE.po
+++ b/mass_mailing_partner/i18n/es_PE.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_PY.po b/mass_mailing_partner/i18n/es_PY.po
index 387074e21..9aa740984 100644
--- a/mass_mailing_partner/i18n/es_PY.po
+++ b/mass_mailing_partner/i18n/es_PY.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/es_VE.po b/mass_mailing_partner/i18n/es_VE.po
index eaac762b4..88b8934c8 100644
--- a/mass_mailing_partner/i18n/es_VE.po
+++ b/mass_mailing_partner/i18n/es_VE.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/et.po b/mass_mailing_partner/i18n/et.po
index 2fda4d241..703b267bf 100644
--- a/mass_mailing_partner/i18n/et.po
+++ b/mass_mailing_partner/i18n/et.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Loodud"
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/eu.po b/mass_mailing_partner/i18n/eu.po
index 0b69e874e..082b85834 100644
--- a/mass_mailing_partner/i18n/eu.po
+++ b/mass_mailing_partner/i18n/eu.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Created on"
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Kidea"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/fa.po b/mass_mailing_partner/i18n/fa.po
index 9dd18818d..8b2035915 100644
--- a/mass_mailing_partner/i18n/fa.po
+++ b/mass_mailing_partner/i18n/fa.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "ایجاد شده در"
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/fi.po b/mass_mailing_partner/i18n/fi.po
index 34fbbde58..c506a9e57 100644
--- a/mass_mailing_partner/i18n/fi.po
+++ b/mass_mailing_partner/i18n/fi.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Luotu"
 msgid "Display Name"
 msgstr "Nimi"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Kumppani"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/fr.po b/mass_mailing_partner/i18n/fr.po
index d14cb045d..c33879008 100644
--- a/mass_mailing_partner/i18n/fr.po
+++ b/mass_mailing_partner/i18n/fr.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Créée le"
 msgid "Display Name"
 msgstr "Nom à afficher"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Statistiques de courriel"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,25 @@ msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Contact de la liste de diffusion"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Liste de diffusion"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Statistiques de courriel"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +122,12 @@ msgid "Mailing contacts number"
 msgstr "Contact de la liste de diffusion"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Contact de la liste de diffusion"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,35 +145,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Contact de la liste de diffusion"
diff --git a/mass_mailing_partner/i18n/fr_CA.po b/mass_mailing_partner/i18n/fr_CA.po
index 54ecc3e68..a0a96aac6 100644
--- a/mass_mailing_partner/i18n/fr_CA.po
+++ b/mass_mailing_partner/i18n/fr_CA.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Créé le"
 msgid "Display Name"
 msgstr "Afficher le nom"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/fr_CH.po b/mass_mailing_partner/i18n/fr_CH.po
index 2a09a9703..c78320160 100644
--- a/mass_mailing_partner/i18n/fr_CH.po
+++ b/mass_mailing_partner/i18n/fr_CH.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Créé le"
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/fr_FR.po b/mass_mailing_partner/i18n/fr_FR.po
index 17094e9d4..419c6c741 100644
--- a/mass_mailing_partner/i18n/fr_FR.po
+++ b/mass_mailing_partner/i18n/fr_FR.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/gl.po b/mass_mailing_partner/i18n/gl.po
index 739d9086b..0fecebb72 100644
--- a/mass_mailing_partner/i18n/gl.po
+++ b/mass_mailing_partner/i18n/gl.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/gl_ES.po b/mass_mailing_partner/i18n/gl_ES.po
index 5b1d5fe5f..0f121faee 100644
--- a/mass_mailing_partner/i18n/gl_ES.po
+++ b/mass_mailing_partner/i18n/gl_ES.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/he.po b/mass_mailing_partner/i18n/he.po
index 7e973c62a..aed0d81db 100644
--- a/mass_mailing_partner/i18n/he.po
+++ b/mass_mailing_partner/i18n/he.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "נוצר ב-"
 msgid "Display Name"
 msgstr "השם המוצג"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/hi.po b/mass_mailing_partner/i18n/hi.po
index 32f646bc2..3fe17c7e4 100644
--- a/mass_mailing_partner/i18n/hi.po
+++ b/mass_mailing_partner/i18n/hi.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/hr.po b/mass_mailing_partner/i18n/hr.po
index 32b2ebdd4..4e317dbe1 100644
--- a/mass_mailing_partner/i18n/hr.po
+++ b/mass_mailing_partner/i18n/hr.po
@@ -20,8 +20,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Stvoreno dana"
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Statistika e-maila"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,25 @@ msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Kontakti za masovno slanje"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Mailing lista"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Statistika e-maila"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -115,17 +123,12 @@ msgid "Mailing contacts number"
 msgstr "Kontakti za masovno slanje"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Kontakti za masovno slanje"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -143,35 +146,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Kontakti za masovno slanje"
diff --git a/mass_mailing_partner/i18n/hr_HR.po b/mass_mailing_partner/i18n/hr_HR.po
index d43ae8dcb..92b19034b 100644
--- a/mass_mailing_partner/i18n/hr_HR.po
+++ b/mass_mailing_partner/i18n/hr_HR.po
@@ -21,8 +21,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Kreirano"
 msgid "Display Name"
 msgstr "Naziv"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/hu.po b/mass_mailing_partner/i18n/hu.po
index 6edf633d0..118ea3a79 100644
--- a/mass_mailing_partner/i18n/hu.po
+++ b/mass_mailing_partner/i18n/hu.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Létrehozás dátuma"
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/id.po b/mass_mailing_partner/i18n/id.po
index 1828c92af..e08b6f960 100644
--- a/mass_mailing_partner/i18n/id.po
+++ b/mass_mailing_partner/i18n/id.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Dibuat pada"
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/it.po b/mass_mailing_partner/i18n/it.po
index 9ae21fd17..a3bb9e90e 100644
--- a/mass_mailing_partner/i18n/it.po
+++ b/mass_mailing_partner/i18n/it.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Creato il"
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,25 @@ msgid "Last Updated on"
 msgstr "Ultimo aggiornamento il"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Contatto Mass Mailing"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Mailing List"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Mailing List"
+msgid "Mailing Statistics"
+msgstr "Mailing List"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +122,12 @@ msgid "Mailing contacts number"
 msgstr "Contatto Mass Mailing"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Contatto Mass Mailing"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,35 +145,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Contatto Mass Mailing"
diff --git a/mass_mailing_partner/i18n/ja.po b/mass_mailing_partner/i18n/ja.po
index a5ab02da4..3ecbbe70b 100644
--- a/mass_mailing_partner/i18n/ja.po
+++ b/mass_mailing_partner/i18n/ja.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "作成日"
 msgid "Display Name"
 msgstr "表示名"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "パートナ"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/ko.po b/mass_mailing_partner/i18n/ko.po
index ae135dcef..e15f084c9 100644
--- a/mass_mailing_partner/i18n/ko.po
+++ b/mass_mailing_partner/i18n/ko.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "작성일"
 msgid "Display Name"
 msgstr "표시 이름"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/lo.po b/mass_mailing_partner/i18n/lo.po
index 41739ec3d..77ddf134b 100644
--- a/mass_mailing_partner/i18n/lo.po
+++ b/mass_mailing_partner/i18n/lo.po
@@ -18,8 +18,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -91,12 +86,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -111,17 +116,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -139,33 +139,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/lt.po b/mass_mailing_partner/i18n/lt.po
index 0302c2752..acb13ced6 100644
--- a/mass_mailing_partner/i18n/lt.po
+++ b/mass_mailing_partner/i18n/lt.po
@@ -20,8 +20,8 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Sukurta"
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/lt_LT.po b/mass_mailing_partner/i18n/lt_LT.po
index 8d06a8441..9ae1a5d97 100644
--- a/mass_mailing_partner/i18n/lt_LT.po
+++ b/mass_mailing_partner/i18n/lt_LT.po
@@ -21,8 +21,8 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Sukurta"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/lv.po b/mass_mailing_partner/i18n/lv.po
index 6f6e5000a..53773f9c6 100644
--- a/mass_mailing_partner/i18n/lv.po
+++ b/mass_mailing_partner/i18n/lv.po
@@ -20,8 +20,8 @@ msgstr ""
 "2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Izveidots"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/mass_mailing_partner.pot b/mass_mailing_partner/i18n/mass_mailing_partner.pot
index 2474274bd..fcf36fa83 100644
--- a/mass_mailing_partner/i18n/mass_mailing_partner.pot
+++ b/mass_mailing_partner/i18n/mass_mailing_partner.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* mass_mailing_partner
+# 	* mass_mailing_partner
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,8 +14,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -87,12 +82,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -107,17 +112,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -135,34 +135,35 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
-msgid "This partner '%s' is linked to one or more mass mailing contact. Email must be assigned."
+msgid ""
+"This partner '%s' is linked to one or more mass mailing contact. Email must "
+"be assigned."
 msgstr ""
-
diff --git a/mass_mailing_partner/i18n/mk.po b/mass_mailing_partner/i18n/mk.po
index d848d1a3e..05fe40e39 100644
--- a/mass_mailing_partner/i18n/mk.po
+++ b/mass_mailing_partner/i18n/mk.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Креирано на"
 msgid "Display Name"
 msgstr "Прикажи име"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Партнер"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/mn.po b/mass_mailing_partner/i18n/mn.po
index b7bda979d..714ffb773 100644
--- a/mass_mailing_partner/i18n/mn.po
+++ b/mass_mailing_partner/i18n/mn.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Үүсгэсэн"
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/nb.po b/mass_mailing_partner/i18n/nb.po
index 410bb724f..a7c3c9e1b 100644
--- a/mass_mailing_partner/i18n/nb.po
+++ b/mass_mailing_partner/i18n/nb.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Opprettet den"
 msgid "Display Name"
 msgstr "Visnings navn"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/nb_NO.po b/mass_mailing_partner/i18n/nb_NO.po
index 199ffefae..57a72c7d2 100644
--- a/mass_mailing_partner/i18n/nb_NO.po
+++ b/mass_mailing_partner/i18n/nb_NO.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Laget den"
 msgid "Display Name"
 msgstr "Vis navn"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/nl.po b/mass_mailing_partner/i18n/nl.po
index d0045969a..03b5368ad 100644
--- a/mass_mailing_partner/i18n/nl.po
+++ b/mass_mailing_partner/i18n/nl.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Aangemaakt op"
 msgid "Display Name"
 msgstr "Te tonen naam"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/nl_BE.po b/mass_mailing_partner/i18n/nl_BE.po
index 4d44812e0..68c37245d 100644
--- a/mass_mailing_partner/i18n/nl_BE.po
+++ b/mass_mailing_partner/i18n/nl_BE.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Gemaakt op"
 msgid "Display Name"
 msgstr "Schermnaam"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/nl_NL.po b/mass_mailing_partner/i18n/nl_NL.po
index b4716ecd6..26976ba92 100644
--- a/mass_mailing_partner/i18n/nl_NL.po
+++ b/mass_mailing_partner/i18n/nl_NL.po
@@ -21,8 +21,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Aangemaakt op"
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/pl.po b/mass_mailing_partner/i18n/pl.po
index 78109f37a..4e43cc11f 100644
--- a/mass_mailing_partner/i18n/pl.po
+++ b/mass_mailing_partner/i18n/pl.po
@@ -21,8 +21,8 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Utworzono"
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/pt.po b/mass_mailing_partner/i18n/pt.po
index 22f9d81bb..261e8ba4b 100644
--- a/mass_mailing_partner/i18n/pt.po
+++ b/mass_mailing_partner/i18n/pt.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Criado em"
 msgid "Display Name"
 msgstr "Nome"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Estatísticas de Email"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,25 @@ msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Contacto do email em massa"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Estatísticas de Email"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -115,17 +123,12 @@ msgid "Mailing contacts number"
 msgstr "Contacto do email em massa"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Contacto do email em massa"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -143,35 +146,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Entidade"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Contacto do email em massa"
diff --git a/mass_mailing_partner/i18n/pt_BR.po b/mass_mailing_partner/i18n/pt_BR.po
index 95dd5eb81..c022e1401 100644
--- a/mass_mailing_partner/i18n/pt_BR.po
+++ b/mass_mailing_partner/i18n/pt_BR.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Criado em"
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/pt_PT.po b/mass_mailing_partner/i18n/pt_PT.po
index c11b79bb5..c346bc713 100644
--- a/mass_mailing_partner/i18n/pt_PT.po
+++ b/mass_mailing_partner/i18n/pt_PT.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Criado em"
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/ro.po b/mass_mailing_partner/i18n/ro.po
index f6b74d2b7..2896752ed 100644
--- a/mass_mailing_partner/i18n/ro.po
+++ b/mass_mailing_partner/i18n/ro.po
@@ -20,8 +20,8 @@ msgstr ""
 "2:1));\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Creat la"
 msgid "Display Name"
 msgstr "Nume Afişat"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partener"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/ru.po b/mass_mailing_partner/i18n/ru.po
index be8684689..606cc8d9f 100644
--- a/mass_mailing_partner/i18n/ru.po
+++ b/mass_mailing_partner/i18n/ru.po
@@ -21,8 +21,8 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Создан"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Контрагент"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/sk.po b/mass_mailing_partner/i18n/sk.po
index bff505be4..21263d295 100644
--- a/mass_mailing_partner/i18n/sk.po
+++ b/mass_mailing_partner/i18n/sk.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Vytvorené"
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Naposledy upravované"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/sl.po b/mass_mailing_partner/i18n/sl.po
index 2ae523bf1..28ba4cbea 100644
--- a/mass_mailing_partner/i18n/sl.po
+++ b/mass_mailing_partner/i18n/sl.po
@@ -20,8 +20,8 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Ustvarjeno"
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr "Statistika e-pošte"
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,25 @@ msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+#, fuzzy
+msgid "Mailing Contact"
+msgstr "Stik masovne pošte"
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Poštni seznam"
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+#, fuzzy
+#| msgid "Email Statistics"
+msgid "Mailing Statistics"
+msgstr "Statistika e-pošte"
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -115,17 +123,12 @@ msgid "Mailing contacts number"
 msgstr "Stik masovne pošte"
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr "Stik masovne pošte"
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -143,35 +146,38 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
 "be assigned."
 msgstr ""
+
+#~ msgid "Mass Mailing Contact"
+#~ msgstr "Stik masovne pošte"
diff --git a/mass_mailing_partner/i18n/sr.po b/mass_mailing_partner/i18n/sr.po
index 325cb95c3..38d49325a 100644
--- a/mass_mailing_partner/i18n/sr.po
+++ b/mass_mailing_partner/i18n/sr.po
@@ -20,8 +20,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Kreiran"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/sr@latin.po b/mass_mailing_partner/i18n/sr@latin.po
index 5d2d8c02a..77f2018fb 100644
--- a/mass_mailing_partner/i18n/sr@latin.po
+++ b/mass_mailing_partner/i18n/sr@latin.po
@@ -21,8 +21,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -68,11 +68,6 @@ msgstr "Kreiran"
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -94,12 +89,22 @@ msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -114,17 +119,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -142,33 +142,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Partner"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/sv.po b/mass_mailing_partner/i18n/sv.po
index ed9fb6fdc..8bd0833b6 100644
--- a/mass_mailing_partner/i18n/sv.po
+++ b/mass_mailing_partner/i18n/sv.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Skapad den"
 msgid "Display Name"
 msgstr "Visa namn"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Företag"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/th.po b/mass_mailing_partner/i18n/th.po
index 7b206eb46..ac8a57a7c 100644
--- a/mass_mailing_partner/i18n/th.po
+++ b/mass_mailing_partner/i18n/th.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "สร้างเมื่อ"
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "พาร์ทเนอร์"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/tr.po b/mass_mailing_partner/i18n/tr.po
index fb08e04ce..51493d525 100644
--- a/mass_mailing_partner/i18n/tr.po
+++ b/mass_mailing_partner/i18n/tr.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Oluşturuldu"
 msgid "Display Name"
 msgstr "Görünen İsim"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Son güncelleme"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "İş Ortağı"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/tr_TR.po b/mass_mailing_partner/i18n/tr_TR.po
index e015380b8..5508270f3 100644
--- a/mass_mailing_partner/i18n/tr_TR.po
+++ b/mass_mailing_partner/i18n/tr_TR.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Oluşturulma tarihi"
 msgid "Display Name"
 msgstr "Görünen ad"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Ortak"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/uk.po b/mass_mailing_partner/i18n/uk.po
index 57800894b..2be3a46f1 100644
--- a/mass_mailing_partner/i18n/uk.po
+++ b/mass_mailing_partner/i18n/uk.po
@@ -20,8 +20,8 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Дата створення"
 msgid "Display Name"
 msgstr "Назва для відображення"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/vi.po b/mass_mailing_partner/i18n/vi.po
index 0d2ea44fb..f4014b577 100644
--- a/mass_mailing_partner/i18n/vi.po
+++ b/mass_mailing_partner/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Được tạo vào"
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -92,12 +87,22 @@ msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -112,17 +117,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -140,33 +140,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "Đối tác"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/vi_VN.po b/mass_mailing_partner/i18n/vi_VN.po
index 8815d2410..023bcdf20 100644
--- a/mass_mailing_partner/i18n/vi_VN.po
+++ b/mass_mailing_partner/i18n/vi_VN.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "Tạo vào"
 msgid "Display Name"
 msgstr ""
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/zh_CN.po b/mass_mailing_partner/i18n/zh_CN.po
index 25ff50bcf..8b854fd57 100644
--- a/mass_mailing_partner/i18n/zh_CN.po
+++ b/mass_mailing_partner/i18n/zh_CN.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "创建时间"
 msgid "Display Name"
 msgstr "显示名称"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/i18n/zh_TW.po b/mass_mailing_partner/i18n/zh_TW.po
index ea8833237..ef1ca869f 100644
--- a/mass_mailing_partner/i18n/zh_TW.po
+++ b/mass_mailing_partner/i18n/zh_TW.po
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing.py:30
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17
+#: code:addons/mass_mailing_partner/models/mailing_contact_subscription.py:0
+#: code:addons/mass_mailing_partner/models/mailing_list.py:0
 #, python-format
 msgid "A partner cannot be multiple times in the same list"
 msgstr ""
@@ -67,11 +67,6 @@ msgstr "建立於"
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mail_statistics
-msgid "Email Statistics"
-msgstr ""
-
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id
 msgid "ID"
@@ -93,12 +88,22 @@ msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact
+msgid "Mailing Contact"
+msgstr ""
+
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__mail_list_id
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
+#. module: mass_mailing_partner
+#: model:ir.model,name:mass_mailing_partner.model_mailing_trace
+msgid "Mailing Statistics"
+msgstr ""
+
 #. module: mass_mailing_partner
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_contact_ids
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_users__mass_mailing_contact_ids
@@ -113,17 +118,12 @@ msgid "Mailing contacts number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_mandatory
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_mandatory
 msgid "Mandatory Partner"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
-#. module: mass_mailing_partner
-#: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel
+#: model:ir.model,name:mass_mailing_partner.model_mailing_contact_subscription
 msgid "Mass Mailing Subscription Information"
 msgstr ""
 
@@ -141,33 +141,33 @@ msgid "Mass mailing stats number"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mail_statistics__partner_id
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__partner_id
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__partner_id
 #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__partner_ids
-#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mail_statistics_search
+#: model_terms:ir.ui.view,arch_db:mass_mailing_partner.mailing_trace_view_search
 #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.view_mail_mass_mailing_contact_search
 msgid "Partner"
 msgstr "夥伴"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:32
+#: code:addons/mass_mailing_partner/wizard/partner_mail_list_wizard.py:0
 #, python-format
 msgid "Partner '%s' has no email."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: model:ir.model.fields,field_description:mass_mailing_partner.field_mail_mass_mailing_list__partner_category
+#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__partner_category
 msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:26
+#: code:addons/mass_mailing_partner/models/mailing_contact.py:0
 #, python-format
 msgid "Partner already exists in one of these mailing lists"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:0
 #, python-format
 msgid ""
 "This partner '%s' is linked to one or more mass mailing contact. Email must "
diff --git a/mass_mailing_partner/models/__init__.py b/mass_mailing_partner/models/__init__.py
index 6b7444238..19ba29ac8 100644
--- a/mass_mailing_partner/models/__init__.py
+++ b/mass_mailing_partner/models/__init__.py
@@ -1,10 +1,7 @@
-# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
-# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-# Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import mail_mass_mailing_contact
+from . import mailing_contact
+from . import mailing_list
+from . import mailing_trace
+from . import mailing_contact_subscription
 from . import res_partner
-from . import mail_mass_mailing
-from . import mail_mail_statistics
-from . import mail_mass_mailing_list_contact_rel
diff --git a/mass_mailing_partner/models/mail_mass_mailing_contact.py b/mass_mailing_partner/models/mailing_contact.py
similarity index 94%
rename from mass_mailing_partner/models/mail_mass_mailing_contact.py
rename to mass_mailing_partner/models/mailing_contact.py
index 263040ddc..ce3af7ee2 100644
--- a/mass_mailing_partner/models/mail_mass_mailing_contact.py
+++ b/mass_mailing_partner/models/mailing_contact.py
@@ -2,14 +2,15 @@
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # Copyright 2017 David Vidal <david.vidal@tecnativa.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
 
-class MailMassMailingContact(models.Model):
-    _inherit = "mail.mass_mailing.contact"
+class MailingContact(models.Model):
+    _inherit = "mailing.contact"
 
     partner_id = fields.Many2one(
         comodel_name="res.partner", string="Partner", domain=[("email", "!=", False)]
@@ -53,7 +54,7 @@ class MailMassMailingContact(models.Model):
             subscription_list_ids=vals.get("subscription_list_ids", False),
             list_ids=vals.get("list_ids", False),
         )
-        return super(MailMassMailingContact, self).create(new_vals)
+        return super(MailingContact, self).create(new_vals)
 
     def write(self, vals):
         for contact in self:
@@ -67,7 +68,7 @@ class MailMassMailingContact(models.Model):
                 subscription_list_ids=vals.get("subscription_list_ids", False),
                 list_ids=vals.get("list_ids", False),
             )
-            super(MailMassMailingContact, contact).write(new_vals)
+            super(MailingContact, contact).write(new_vals)
         return True
 
     def _get_company(self):
@@ -96,7 +97,6 @@ class MailMassMailingContact(models.Model):
             "category_id": self._get_categories(),
         }
 
-    @api.multi
     def _set_partner(self):
         self.ensure_one()
         m_partner = self.env["res.partner"]
diff --git a/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py b/mass_mailing_partner/models/mailing_contact_subscription.py
similarity index 72%
rename from mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py
rename to mass_mailing_partner/models/mailing_contact_subscription.py
index 42cef70b9..cec47dda5 100644
--- a/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py
+++ b/mass_mailing_partner/models/mailing_contact_subscription.py
@@ -1,12 +1,13 @@
 # Copyright 2018 Tecnativa - Ernesto Tejeda
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, models
 from odoo.exceptions import ValidationError
 
 
-class MassMailingContactListRel(models.Model):
-    _inherit = "mail.mass_mailing.list_contact_rel"
+class MailingContactSubscription(models.Model):
+    _inherit = "mailing.contact.subscription"
 
     @api.constrains("contact_id", "list_id")
     def _check_contact_id_partner_id_list_id(self):
@@ -15,5 +16,5 @@ class MassMailingContactListRel(models.Model):
                 contacts = rel.list_id.contact_ids - rel.contact_id
                 if rel.contact_id.partner_id in contacts.mapped("partner_id"):
                     raise ValidationError(
-                        _("A partner cannot be multiple " "times in the same list")
+                        _("A partner cannot be multiple times in the same list")
                     )
diff --git a/mass_mailing_partner/models/mail_mass_mailing.py b/mass_mailing_partner/models/mailing_list.py
similarity index 87%
rename from mass_mailing_partner/models/mail_mass_mailing.py
rename to mass_mailing_partner/models/mailing_list.py
index 6887d9f48..f6d9727e1 100644
--- a/mass_mailing_partner/models/mail_mass_mailing.py
+++ b/mass_mailing_partner/models/mailing_list.py
@@ -1,14 +1,15 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
 
-class MailMassMailingList(models.Model):
-    _inherit = "mail.mass_mailing.list"
+class MailingList(models.Model):
+    _inherit = "mailing.list"
 
     partner_mandatory = fields.Boolean(string="Mandatory Partner", default=False)
     partner_category = fields.Many2one(
@@ -17,7 +18,7 @@ class MailMassMailingList(models.Model):
 
     @api.constrains("contact_ids")
     def _check_contact_ids_partner_id(self):
-        contact_obj = self.env["mail.mass_mailing.contact"]
+        contact_obj = self.env["mailing.contact"]
         for mailing_list in self:
             data = contact_obj.read_group(
                 [
diff --git a/mass_mailing_partner/models/mail_mail_statistics.py b/mass_mailing_partner/models/mailing_trace.py
similarity index 86%
rename from mass_mailing_partner/models/mail_mail_statistics.py
rename to mass_mailing_partner/models/mailing_trace.py
index b7aca9e0b..f41b0bd60 100644
--- a/mass_mailing_partner/models/mail_mail_statistics.py
+++ b/mass_mailing_partner/models/mailing_trace.py
@@ -1,11 +1,12 @@
 # Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import api, fields, models
 
 
-class MailMailStatistics(models.Model):
-    _inherit = "mail.mail.statistics"
+class MailingTrace(models.Model):
+    _inherit = "mailing.trace"
 
     partner_id = fields.Many2one(
         string="Partner", comodel_name="res.partner", readonly=True
@@ -31,6 +32,6 @@ class MailMailStatistics(models.Model):
 
     @api.model
     def create(self, vals):
-        stat = super(MailMailStatistics, self).create(vals)
+        stat = super(MailingTrace, self).create(vals)
         stat.partner_link()
         return stat
diff --git a/mass_mailing_partner/models/res_partner.py b/mass_mailing_partner/models/res_partner.py
index 96ae35964..9c46b1993 100644
--- a/mass_mailing_partner/models/res_partner.py
+++ b/mass_mailing_partner/models/res_partner.py
@@ -2,6 +2,7 @@
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # Copyright 2017 David Vidal <david.vidal@tecnativa.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, fields, models
@@ -13,7 +14,7 @@ class ResPartner(models.Model):
 
     mass_mailing_contact_ids = fields.One2many(
         string="Mailing contacts",
-        comodel_name="mail.mass_mailing.contact",
+        comodel_name="mailing.contact",
         inverse_name="partner_id",
     )
     mass_mailing_contacts_count = fields.Integer(
@@ -24,7 +25,7 @@ class ResPartner(models.Model):
     )
     mass_mailing_stats_ids = fields.One2many(
         string="Mass mailing stats",
-        comodel_name="mail.mail.statistics",
+        comodel_name="mailing.trace",
         inverse_name="partner_id",
     )
     mass_mailing_stats_count = fields.Integer(
@@ -47,24 +48,24 @@ class ResPartner(models.Model):
 
     @api.depends("mass_mailing_contact_ids")
     def _compute_mass_mailing_contacts_count(self):
-        contact_data = self.env["mail.mass_mailing.contact"].read_group(
+        contact_data = self.env["mailing.contact"].read_group(
             [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"]
         )
         mapped_data = {
-                contact["partner_id"][0]: contact["partner_id_count"]
-                for contact in contact_data
+            contact["partner_id"][0]: contact["partner_id_count"]
+            for contact in contact_data
         }
         for partner in self:
             partner.mass_mailing_contacts_count = mapped_data.get(partner.id, 0)
 
     @api.depends("mass_mailing_stats_ids")
     def _compute_mass_mailing_stats_count(self):
-        contact_data = self.env["mail.mail.statistics"].read_group(
+        contact_data = self.env["mailing.trace"].read_group(
             [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"]
         )
         mapped_data = {
-                contact["partner_id"][0]: contact["partner_id_count"]
-                for contact in contact_data
+            contact["partner_id"][0]: contact["partner_id_count"]
+            for contact in contact_data
         }
         for partner in self:
             partner.mass_mailing_stats_count = mapped_data.get(partner.id, 0)
@@ -87,7 +88,7 @@ class ResPartner(models.Model):
             mm_vals["tag_ids"] = vals["category_id"]
         if mm_vals:
             # Using sudo because ACLs shouldn't produce data inconsistency
-            self.env["mail.mass_mailing.contact"].sudo().search(
+            self.env["mailing.contact"].sudo().search(
                 [("partner_id", "in", self.ids)]
             ).write(mm_vals)
         return res
diff --git a/mass_mailing_partner/readme/CONTRIBUTORS.rst b/mass_mailing_partner/readme/CONTRIBUTORS.rst
index 1b0b2ac3d..ab4be7126 100644
--- a/mass_mailing_partner/readme/CONTRIBUTORS.rst
+++ b/mass_mailing_partner/readme/CONTRIBUTORS.rst
@@ -8,3 +8,4 @@
     * David Vidal
     * Ernesto Tejeda
     * Victor M.M. Torres
+    * Manuel Calero
diff --git a/mass_mailing_partner/static/description/index.html b/mass_mailing_partner/static/description/index.html
index 3b36c92a6..37d8fc419 100644
--- a/mass_mailing_partner/static/description/index.html
+++ b/mass_mailing_partner/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mass_mailing_partner"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_partner"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mass_mailing_partner"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_partner"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module links mass-mailing contacts with partners.</p>
 <div class="section" id="features">
 <h1>Features</h1>
@@ -404,7 +404,7 @@ as mailing list contacts.</p>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mass_mailing_partner%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mass_mailing_partner%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -431,6 +431,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <li>David Vidal</li>
 <li>Ernesto Tejeda</li>
 <li>Victor M.M. Torres</li>
+<li>Manuel Calero</li>
 </ul>
 </blockquote>
 </li>
@@ -443,7 +444,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mass_mailing_partner">OCA/social</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mass_mailing_partner">OCA/social</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/mass_mailing_partner/tests/__init__.py b/mass_mailing_partner/tests/__init__.py
index f98b3f15d..cb4bd1405 100644
--- a/mass_mailing_partner/tests/__init__.py
+++ b/mass_mailing_partner/tests/__init__.py
@@ -1,6 +1,3 @@
-# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
-# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-# Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import test_mail_mass_mailing_contact, test_res_partner
diff --git a/mass_mailing_partner/tests/base.py b/mass_mailing_partner/tests/base.py
index c03a025ab..77b9e949c 100644
--- a/mass_mailing_partner/tests/base.py
+++ b/mass_mailing_partner/tests/base.py
@@ -1,6 +1,7 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.tests.common import TransactionCase
@@ -41,11 +42,11 @@ class BaseCase(TransactionCase):
         return m_partner.create(vals)
 
     def create_mailing_contact(self, vals):
-        m_mailing_contact = self.env["mail.mass_mailing.contact"]
+        m_mailing_contact = self.env["mailing.contact"]
         return m_mailing_contact.create(vals)
 
     def create_mailing_list(self, vals):
-        m_mailing_list = self.env["mail.mass_mailing.list"]
+        m_mailing_list = self.env["mailing.list"]
         return m_mailing_list.create(vals)
 
     def check_mailing_contact_partner(self, mailing_contact):
diff --git a/mass_mailing_partner/tests/test_mail_mail_statistics.py b/mass_mailing_partner/tests/test_mail_mail_statistics.py
index 6344dbdbf..1ecdf2b53 100644
--- a/mass_mailing_partner/tests/test_mail_mail_statistics.py
+++ b/mass_mailing_partner/tests/test_mail_mail_statistics.py
@@ -1,6 +1,7 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import base
@@ -9,7 +10,7 @@ from . import base
 class MailMailStatisticsCase(base.BaseCase):
     def test_link_partner(self):
         partner = self.create_partner({"name": "Test partner"})
-        stat = self.env["mail.mail.statistics"].create(
+        stat = self.env["mailing.trace"].create(
             {"model": "res.partner", "res_id": partner.id}
         )
         self.assertEqual(partner.id, stat.partner_id.id)
@@ -23,7 +24,7 @@ class MailMailStatisticsCase(base.BaseCase):
             "list_ids": [[6, 0, [self.mailing_list.id]]],
         }
         contact = self.create_mailing_contact(contact_vals)
-        stat = self.env["mail.mail.statistics"].create(
-            {"model": "mail.mass_mailing.contact", "res_id": contact.id}
+        stat = self.env["mailing.trace"].create(
+            {"model": "mailing.contact", "res_id": contact.id}
         )
         self.assertEqual(partner.id, stat.partner_id.id)
diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py b/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py
index c1d84ac4e..54a9c9bce 100644
--- a/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py
+++ b/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py
@@ -1,6 +1,7 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import ValidationError
@@ -104,7 +105,6 @@ class MailMassMailingContactCase(base.BaseCase):
             "category_id": [(6, 0, (category_8 | category_11).ids)],
         }
         partner = self.create_partner(partner_vals)
-        with self.env.do_in_onchange():
-            contact.partner_id = partner
-            contact._onchange_partner_mass_mailing_partner()
-            self.check_mailing_contact_partner(contact)
+        contact.partner_id = partner
+        contact._onchange_partner_mass_mailing_partner()
+        self.check_mailing_contact_partner(contact)
diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_list.py b/mass_mailing_partner/tests/test_mail_mass_mailing_list.py
index e433fe7c8..08b9d9f26 100644
--- a/mass_mailing_partner/tests/test_mail_mass_mailing_list.py
+++ b/mass_mailing_partner/tests/test_mail_mass_mailing_list.py
@@ -1,4 +1,5 @@
 # Copyright 2018 Tecnativa - Ernesto tejeda
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import ValidationError
@@ -33,9 +34,6 @@ class MailMassMailingListCase(base.BaseCase):
             self.create_mailing_list(
                 {
                     "name": "List test 3",
-                    "subscription_contact_ids": [
-                        (0, 0, {"contact_id": contact_test_1.id}),
-                        (0, 0, {"contact_id": contact_test_2.id}),
-                    ],
+                    "contact_ids": [(4, contact_test_1.id), (4, contact_test_2.id)],
                 }
             )
diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py b/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py
index 20cdb3352..5d19b214a 100644
--- a/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py
+++ b/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py
@@ -1,4 +1,5 @@
 # Copyright 2018 Tecnativa - Ernesto tejeda
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import ValidationError
@@ -14,13 +15,8 @@ class MailMassMailingListContactRelCase(base.BaseCase):
         contact_test_2 = self.create_mailing_contact(
             {"name": "Contact test 2", "partner_id": self.partner.id}
         )
-        list_3 = self.create_mailing_list({"name": "List test 3"})
-
-        self.env["mail.mass_mailing.list_contact_rel"].create(
-            {"list_id": list_3.id, "contact_id": contact_test_1.id}
+        list_3 = self.create_mailing_list(
+            {"name": "List test 3", "contact_ids": [(4, contact_test_1.id)]}
         )
-
         with self.assertRaises(ValidationError):
-            self.env["mail.mass_mailing.list_contact_rel"].create(
-                {"list_id": list_3.id, "contact_id": contact_test_2.id}
-            )
+            list_3.contact_ids = [(4, contact_test_2.id)]
diff --git a/mass_mailing_partner/tests/test_partner_mail_list_wizard.py b/mass_mailing_partner/tests/test_partner_mail_list_wizard.py
index 896629ab4..15a040997 100644
--- a/mass_mailing_partner/tests/test_partner_mail_list_wizard.py
+++ b/mass_mailing_partner/tests/test_partner_mail_list_wizard.py
@@ -1,6 +1,7 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import UserError
@@ -15,7 +16,7 @@ class PartnerMailListWizardCase(base.BaseCase):
         )
         wizard.partner_ids = [self.partner.id]
         wizard.add_to_mail_list()
-        contacts = self.env["mail.mass_mailing.contact"].search(
+        contacts = self.env["mailing.contact"].search(
             [("partner_id", "=", self.partner.id)]
         )
         cont = contacts.filtered(lambda r: wizard.mail_list_id in r.list_ids)
diff --git a/mass_mailing_partner/tests/test_res_partner.py b/mass_mailing_partner/tests/test_res_partner.py
index c059bcce4..ef1ff3cb8 100644
--- a/mass_mailing_partner/tests/test_res_partner.py
+++ b/mass_mailing_partner/tests/test_res_partner.py
@@ -1,6 +1,7 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import ValidationError
diff --git a/mass_mailing_partner/views/mail_mail_statistics_view.xml b/mass_mailing_partner/views/mail_mail_statistics_view.xml
deleted file mode 100644
index 40808a516..000000000
--- a/mass_mailing_partner/views/mail_mail_statistics_view.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
-<odoo>
-
-<record model="ir.ui.view" id="view_mail_mail_statistics_form">
-    <field name="name">Add partner field</field>
-    <field name="model">mail.mail.statistics</field>
-    <field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_form"/>
-    <field name="arch" type="xml">
-        <field name="res_id" position="after">
-            <field name="partner_id"/>
-        </field>
-    </field>
-</record>
-
-<record model="ir.ui.view" id="view_mail_mail_statistics_tree">
-    <field name="name">Add partner column</field>
-    <field name="model">mail.mail.statistics</field>
-    <field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_tree"/>
-    <field name="arch" type="xml">
-        <field name="sent" position="before">
-            <field name="partner_id"/>
-        </field>
-    </field>
-</record>
-
-<record model="ir.ui.view" id="view_mail_mail_statistics_search">
-    <field name="name">Add partner search field and group by</field>
-    <field name="model">mail.mail.statistics</field>
-    <field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_search"/>
-    <field name="arch" type="xml">
-        <field name="mass_mailing_id" position="after">
-            <field name="partner_id"/>
-        </field>
-        <filter name="group_reply_date" position="after">
-            <filter string="Partner"
-                    name="group_partner"
-                    context="{'group_by': 'partner_id'}"/>
-        </filter>
-    </field>
-</record>
-
-</odoo>
diff --git a/mass_mailing_partner/views/mail_mass_mailing_contact_view.xml b/mass_mailing_partner/views/mail_mass_mailing_contact_view.xml
deleted file mode 100644
index dcbac3516..000000000
--- a/mass_mailing_partner/views/mail_mass_mailing_contact_view.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
-     Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-     Copyright 2015 Javier Iniesta <javieria@antiun.com>
-     Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
-<odoo>
-
-    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_tree">
-            <field name="name">mail.mass_mailing.contact.tree.inherit</field>
-            <field name="model">mail.mass_mailing.contact</field>
-            <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_tree"/>
-            <field name="arch" type="xml">
-                <field name="email" position="after">
-                    <field name="partner_id"/>
-                </field>
-            </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_form">
-        <field name="name">mail.mass_mailing.contact.form.partner</field>
-        <field name="model">mail.mass_mailing.contact</field>
-        <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='email']/.." position="after">
-                <field name="partner_id"/>
-            </xpath>
-            <field name="title_id" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-            <field name="email" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-            <field name="name" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-            <field name="company_name" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-            <field name="country_id" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-            <field name="tag_ids" position="attributes">
-                <attribute name="attrs">{'readonly': [('partner_id', '!=', False)]}</attribute>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_search">
-        <field name="name">Add partner search field and group by</field>
-        <field name="model">mail.mass_mailing.contact</field>
-        <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_search"/>
-        <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="partner_id"/>
-            </field>
-            <filter name="group_create_date" position="after">
-                <filter string="Partner"
-                        name="group_partner"
-                        context="{'group_by': 'partner_id'}"/>
-            </filter>
-        </field>
-    </record>
-
-</odoo>
diff --git a/mass_mailing_partner/views/mailing_contact_view.xml b/mass_mailing_partner/views/mailing_contact_view.xml
new file mode 100644
index 000000000..91b42b916
--- /dev/null
+++ b/mass_mailing_partner/views/mailing_contact_view.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+     Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
+     Copyright 2015 Javier Iniesta <javieria@antiun.com>
+     Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
+     Copyright 2020 Tecnativa - Manuel Calero
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+<odoo>
+
+    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_tree">
+            <field name="name">mailing.contact.tree.inherit</field>
+            <field name="model">mailing.contact</field>
+            <field
+            name="inherit_id"
+            ref="mass_mailing.view_mail_mass_mailing_contact_tree"
+        />
+            <field name="arch" type="xml">
+                <field name="email" position="after">
+                    <field name="partner_id" />
+                </field>
+            </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_form">
+        <field name="name">mailing.contact.form.partner</field>
+        <field name="model">mailing.contact</field>
+        <field
+            name="inherit_id"
+            ref="mass_mailing.view_mail_mass_mailing_contact_form"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='email']/.." position="after">
+                <field name="partner_id" />
+            </xpath>
+            <field name="title_id" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+            <field name="email" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+            <field name="name" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+            <field name="company_name" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+            <field name="country_id" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+            <field name="tag_ids" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_mail_mass_mailing_contact_search">
+        <field name="name">Add partner search field and group by</field>
+        <field name="model">mailing.contact</field>
+        <field
+            name="inherit_id"
+            ref="mass_mailing.view_mail_mass_mailing_contact_search"
+        />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="partner_id" />
+            </field>
+            <filter name="group_create_date" position="after">
+                <filter
+                    string="Partner"
+                    name="group_partner"
+                    context="{'group_by': 'partner_id'}"
+                />
+            </filter>
+        </field>
+    </record>
+
+</odoo>
diff --git a/mass_mailing_partner/views/mailing_trace_view.xml b/mass_mailing_partner/views/mailing_trace_view.xml
new file mode 100644
index 000000000..9d091bd77
--- /dev/null
+++ b/mass_mailing_partner/views/mailing_trace_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
+     Copyright 2020 Tecnativa - Manuel Calero
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+<odoo>
+
+<record model="ir.ui.view" id="mailing_trace_view_form">
+    <field name="name">Add partner field</field>
+    <field name="model">mailing.trace</field>
+    <field name="inherit_id" ref="mass_mailing.mailing_trace_view_form" />
+    <field name="arch" type="xml">
+        <field name="res_id" position="after">
+            <field name="partner_id" />
+        </field>
+    </field>
+</record>
+
+<record model="ir.ui.view" id="mailing_trace_view_tree">
+    <field name="name">Add partner column</field>
+    <field name="model">mailing.trace</field>
+    <field name="inherit_id" ref="mass_mailing.mailing_trace_view_tree" />
+    <field name="arch" type="xml">
+        <field name="sent" position="before">
+            <field name="partner_id" />
+        </field>
+    </field>
+</record>
+
+<record model="ir.ui.view" id="mailing_trace_view_search">
+    <field name="name">Add partner search field and group by</field>
+    <field name="model">mailing.trace</field>
+    <field name="inherit_id" ref="mass_mailing.mailing_trace_view_search" />
+    <field name="arch" type="xml">
+        <field name="mass_mailing_id" position="after">
+            <field name="partner_id" />
+        </field>
+        <filter name="group_reply_date" position="after">
+            <filter
+                    string="Partner"
+                    name="group_partner"
+                    context="{'group_by': 'partner_id'}"
+                />
+        </filter>
+    </field>
+</record>
+
+</odoo>
diff --git a/mass_mailing_partner/views/mail_mass_mailing_view.xml b/mass_mailing_partner/views/mailing_view.xml
similarity index 55%
rename from mass_mailing_partner/views/mail_mass_mailing_view.xml
rename to mass_mailing_partner/views/mailing_view.xml
index 7ae983369..3ed5e6542 100644
--- a/mass_mailing_partner/views/mail_mass_mailing_view.xml
+++ b/mass_mailing_partner/views/mailing_view.xml
@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
      Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
      Copyright 2015 Javier Iniesta <javieria@antiun.com>
+     Copyright 2020 Tecnativa - Manuel Calero
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
 
-<record model="ir.ui.view" id="view_mail_mass_mailing_list_form">
-    <field name="name">mail.mass_mailing.list.form</field>
-    <field name="model">mail.mass_mailing.list</field>
-    <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_list_form"/>
+<record model="ir.ui.view" id="mailing_list_view_form">
+    <field name="name">mailing.list.form</field>
+    <field name="model">mailing.list</field>
+    <field name="inherit_id" ref="mass_mailing.mailing_list_view_form" />
     <field name="arch" type="xml">
         <xpath expr="//div[hasclass('oe_title')]" position="after">
             <group>
                 <group>
-                    <field name="partner_mandatory"/>
-                    <field name="partner_category"/>
+                    <field name="partner_mandatory" />
+                    <field name="partner_category" />
                 </group>
             </group>
         </xpath>
diff --git a/mass_mailing_partner/views/res_partner_view.xml b/mass_mailing_partner/views/res_partner_view.xml
index 18e8bf57c..967f9e4b6 100644
--- a/mass_mailing_partner/views/res_partner_view.xml
+++ b/mass_mailing_partner/views/res_partner_view.xml
@@ -1,37 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
      Copyright 2015-16 Antonio Espinosa <antonio.espinosa@tecnativa.com>
      Copyright 2015 Javier Iniesta <javieria@antiun.com>
      Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
+     Copyright 2020 Tecnativa - Manuel Calero
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
 
     <record model="ir.ui.view" id="view_partner_form">
         <field name="name">Partner Form with mailing contacts</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="groups_id" eval="[(4, ref('mass_mailing.group_mass_mailing_user'))]"/>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('mass_mailing.group_mass_mailing_user'))]"
+        />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button name="%(mass_mailing.action_view_mass_mailing_contacts)d"
-                        context="{'search_default_partner_id': active_id,
+                <button
+                    name="%(mass_mailing.action_view_mass_mailing_contacts)d"
+                    context="{'search_default_partner_id': active_id,
                                   'default_partner_id': active_id}"
-                        type="action"
-                        class="oe_stat_button oe_inline"
-                        icon="fa-envelope-o">
-                    <field name="mass_mailing_contacts_count"
-                           widget="statinfo"
-                           string="Mailing contacts"/>
+                    type="action"
+                    class="oe_stat_button oe_inline"
+                    icon="fa-envelope-o"
+                >
+                    <field
+                        name="mass_mailing_contacts_count"
+                        widget="statinfo"
+                        string="Mailing contacts"
+                    />
                 </button>
-                <button name="%(mass_mailing.action_view_mail_mail_statistics)d"
-                        context="{'search_default_partner_id': active_id,
+                <button
+                    name="%(mass_mailing.mailing_trace_action)d"
+                    context="{'search_default_partner_id': active_id,
                                   'default_partner_id': active_id}"
-                        type="action"
-                        class="oe_stat_button oe_inline"
-                        icon="fa-envelope-o">
-                    <field name="mass_mailing_stats_count"
-                           widget="statinfo"
-                           string="Mass mailing stats"/>
+                    type="action"
+                    class="oe_stat_button oe_inline"
+                    icon="fa-envelope-o"
+                >
+                    <field
+                        name="mass_mailing_stats_count"
+                        widget="statinfo"
+                        string="Mass mailing stats"
+                    />
                 </button>
             </div>
         </field>
@@ -40,13 +52,19 @@
     <record id="view_res_partner_filter" model="ir.ui.view">
         <field name="name">Partner Search with mailing contacts</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_res_partner_filter"/>
-        <field name="groups_id" eval="[(4, ref('mass_mailing.group_mass_mailing_user'))]"/>
+        <field name="inherit_id" ref="base.view_res_partner_filter" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('mass_mailing.group_mass_mailing_user'))]"
+        />
         <field name="priority">20</field>
         <field name="arch" type="xml">
             <field name="category_id" position="after">
-                <field name="mass_mailing_contact_ids" string="Mailing List"
-                    filter_domain="[('mass_mailing_contact_ids.list_ids','ilike', self)]"/>
+                <field
+                    name="mass_mailing_contact_ids"
+                    string="Mailing List"
+                    filter_domain="[('mass_mailing_contact_ids.list_ids','ilike', self)]"
+                />
             </field>
         </field>
     </record>
diff --git a/mass_mailing_partner/wizard/__init__.py b/mass_mailing_partner/wizard/__init__.py
index a53b4177a..2773da8e5 100644
--- a/mass_mailing_partner/wizard/__init__.py
+++ b/mass_mailing_partner/wizard/__init__.py
@@ -1,6 +1,3 @@
-# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
-# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
-# Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import partner_mail_list_wizard
diff --git a/mass_mailing_partner/wizard/partner_mail_list_wizard.py b/mass_mailing_partner/wizard/partner_mail_list_wizard.py
index 1466f3469..79b35e0c5 100644
--- a/mass_mailing_partner/wizard/partner_mail_list_wizard.py
+++ b/mass_mailing_partner/wizard/partner_mail_list_wizard.py
@@ -1,9 +1,10 @@
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
+# Copyright 2020 Tecnativa - Manuel Calero
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 from odoo.exceptions import UserError
 
 
@@ -11,23 +12,22 @@ class PartnerMailListWizard(models.TransientModel):
     _name = "partner.mail.list.wizard"
     _description = "Create contact mailing list"
 
-    mail_list_id = fields.Many2one(
-        comodel_name="mail.mass_mailing.list", string="Mailing List"
-    )
+    mail_list_id = fields.Many2one(comodel_name="mailing.list", string="Mailing List")
     partner_ids = fields.Many2many(
         comodel_name="res.partner",
         relation="mail_list_wizard_partner",
         default=lambda self: self.env.context.get("active_ids"),
     )
 
-    @api.multi
     def add_to_mail_list(self):
-        contact_obj = self.env["mail.mass_mailing.contact"]
+        contact_obj = self.env["mailing.contact"]
         partners = self.partner_ids
 
         add_list = partners.filtered("mass_mailing_contact_ids")
         for partner in add_list:
-            partner.mass_mailing_contact_ids[0].list_ids |= self.mail_list_id
+            self.mail_list_id.contact_ids = [
+                (4, partner.mass_mailing_contact_ids[0].id)
+            ]
 
         to_create = partners - add_list
         for partner in to_create:
@@ -35,7 +35,7 @@ class PartnerMailListWizard(models.TransientModel):
                 raise UserError(_("Partner '%s' has no email.") % partner.name)
             contact_vals = {
                 "partner_id": partner.id,
-                "list_ids": [[6, 0, [self.mail_list_id.id]]],
+                "list_ids": [(4, self.mail_list_id.id)],
                 "title_id": partner.title or False,
                 "company_name": partner.company_id.name or False,
                 "country_id": partner.country_id or False,
diff --git a/mass_mailing_partner/wizard/partner_mail_list_wizard.xml b/mass_mailing_partner/wizard/partner_mail_list_wizard.xml
index ff94ade5d..1b323630a 100644
--- a/mass_mailing_partner/wizard/partner_mail_list_wizard.xml
+++ b/mass_mailing_partner/wizard/partner_mail_list_wizard.xml
@@ -1,33 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
      Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
      Copyright 2015 Javier Iniesta <javieria@antiun.com>
+     Copyright 2020 Tecnativa - Manuel Calero
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
 
-<act_window name="Add to mailing list"
-    res_model="partner.mail.list.wizard"
-    src_model="res.partner"
-    view_mode="form"
-    target="new"
-    key2="client_action_multi"
-    id="action_partner_mail_list"/>
+    <act_window
+        id="action_partner_mail_list"
+        name="Add to mailing list"
+        res_model="partner.mail.list.wizard"
+        binding_model="res.partner"
+        target="new"
+        view_mode="form"
+    />
 
-<record model="ir.ui.view" id="partner_mail_list_wizard_form">
-    <field name="name">partner.mail.list.form</field>
-    <field name="model">partner.mail.list.wizard</field>
-    <field name="arch" type="xml">
-        <form string="Create contact mailing list">
-            <group>
-                <field name="mail_list_id"/>
-            </group>
-            <footer>
-                <button string="Add contacts to mailing list" name="add_to_mail_list"
-                    type="object" class="oe_highlight"/>
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </footer>
-        </form>
-    </field>
-</record>
+    <record model="ir.ui.view" id="partner_mail_list_wizard_form">
+        <field name="name">partner.mail.list.form</field>
+        <field name="model">partner.mail.list.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Create contact mailing list">
+                <group>
+                    <field name="mail_list_id" />
+                </group>
+                <footer>
+                    <button
+                        string="Add contacts to mailing list"
+                        name="add_to_mail_list"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
 
 </odoo>