diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index c735665be15..f8aec351693 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -28,7 +28,8 @@ If you need to manage your meetings, you should install the CRM module.
         'data/calendar_cron.xml',
         'data/mail_template_data.xml',
         'data/calendar_data.xml',
-        'data/mail_data_various.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_message_subtype_data.xml',
         'views/mail_activity_views.xml',
         'views/calendar_templates.xml',
         'views/calendar_views.xml',
diff --git a/addons/calendar/data/mail_activity_type_data.xml b/addons/calendar/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..544696fbd60
--- /dev/null
+++ b/addons/calendar/data/mail_activity_type_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mail.mail_activity_data_meeting" model="mail.activity.type">
+            <field name="category">meeting</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/calendar/data/mail_data_various.xml b/addons/calendar/data/mail_message_subtype_data.xml
similarity index 71%
rename from addons/calendar/data/mail_data_various.xml
rename to addons/calendar/data/mail_message_subtype_data.xml
index aef25277b0f..92d1c289dac 100644
--- a/addons/calendar/data/mail_data_various.xml
+++ b/addons/calendar/data/mail_message_subtype_data.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
     <data noupdate="1">
-        <record id="mail.mail_activity_data_meeting" model="mail.activity.type">
-            <field name="category">meeting</field>
-        </record>
-
         <record id="calendar.subtype_invitation" model="mail.message.subtype">
             <field name="name">Invitation</field>
             <field name="res_model">calendar.event</field>
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index 5d0ed383a24..a247d683053 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -34,7 +34,7 @@
         'data/digest_data.xml',
         'data/ir_action_data.xml',
         'data/ir_cron_data.xml',
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/crm_recurring_plan_data.xml',
 
         'wizard/crm_lead_lost_views.xml',
@@ -64,7 +64,7 @@
         'data/crm_team_demo.xml',
         'data/mail_template_demo.xml',
         'data/crm_team_member_demo.xml',
-        'data/mail_activity_demo.xml',
+        'data/mail_activity_type_demo.xml',
         'data/crm_lead_demo.xml',
     ],
     'installable': True,
diff --git a/addons/crm/data/mail_activity_demo.xml b/addons/crm/data/mail_activity_type_demo.xml
similarity index 100%
rename from addons/crm/data/mail_activity_demo.xml
rename to addons/crm/data/mail_activity_type_demo.xml
diff --git a/addons/crm/data/mail_data.xml b/addons/crm/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/crm/data/mail_data.xml
rename to addons/crm/data/mail_message_subtype_data.xml
diff --git a/addons/event_booth/__manifest__.py b/addons/event_booth/__manifest__.py
index 22f4026f3e1..80ae450a0be 100644
--- a/addons/event_booth/__manifest__.py
+++ b/addons/event_booth/__manifest__.py
@@ -19,7 +19,7 @@ Create booths for your favorite event.
         'views/event_event_views.xml',
         'views/event_menus.xml',
         'data/event_booth_category_data.xml',
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_templates.xml',
     ],
     'demo': [
diff --git a/addons/event_booth/data/mail_data.xml b/addons/event_booth/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/event_booth/data/mail_data.xml
rename to addons/event_booth/data/mail_message_subtype_data.xml
diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py
index c114a046c85..caff9de6f23 100644
--- a/addons/event_sale/__manifest__.py
+++ b/addons/event_sale/__manifest__.py
@@ -25,7 +25,7 @@ this event.
         'views/event_views.xml',
         'views/sale_order_views.xml',
         'data/event_sale_data.xml',
-        'data/mail_data.xml',
+        'data/mail_templates.xml',
         'report/event_event_templates.xml',
         'report/event_sale_report_views.xml',
         'security/ir.model.access.csv',
diff --git a/addons/event_sale/data/mail_data.xml b/addons/event_sale/data/mail_templates.xml
similarity index 100%
rename from addons/event_sale/data/mail_data.xml
rename to addons/event_sale/data/mail_templates.xml
diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py
index 3f52117fafa..53f9082c39e 100644
--- a/addons/fleet/__manifest__.py
+++ b/addons/fleet/__manifest__.py
@@ -39,7 +39,8 @@ Main Features
         'views/res_config_settings_views.xml',
         'data/fleet_cars_data.xml',
         'data/fleet_data.xml',
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
+        'data/mail_activity_type_data.xml',
     ],
 
     'demo': ['data/fleet_demo.xml'],
diff --git a/addons/fleet/data/mail_activity_type_data.xml b/addons/fleet/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..3ee9a3c04ff
--- /dev/null
+++ b/addons/fleet/data/mail_activity_type_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mail_act_fleet_contract_to_renew" model="mail.activity.type">
+            <field name="name">Contract to Renew</field>
+            <field name="icon">fa-car</field>
+            <field name="res_model">fleet.vehicle.log.contract</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/fleet/data/mail_data.xml b/addons/fleet/data/mail_message_subtype_data.xml
similarity index 62%
rename from addons/fleet/data/mail_data.xml
rename to addons/fleet/data/mail_message_subtype_data.xml
index 969438a86fd..3d907ed40f7 100644
--- a/addons/fleet/data/mail_data.xml
+++ b/addons/fleet/data/mail_message_subtype_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="mail_act_fleet_contract_to_renew" model="mail.activity.type">
-            <field name="name">Contract to Renew</field>
-            <field name="icon">fa-car</field>
-            <field name="res_model">fleet.vehicle.log.contract</field>
-        </record>
-
         <record id="mt_fleet_driver_updated" model="mail.message.subtype">
             <field name="name">Changed Driver</field>
             <field name="sequence">0</field>
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index fed61af59be..dc357795505 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -31,7 +31,9 @@ This module also uses analytic accounting and is compatible with the invoice on
         'security/hr_expense_security.xml',
         'security/ir.model.access.csv',
         'data/digest_data.xml',
-        'data/mail_data.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_alias_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_templates.xml',
         'data/hr_expense_sequence.xml',
         'data/hr_expense_data.xml',
diff --git a/addons/hr_expense/data/mail_activity_type_data.xml b/addons/hr_expense/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..94821dd5501
--- /dev/null
+++ b/addons/hr_expense/data/mail_activity_type_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mail_act_expense_approval" model="mail.activity.type">
+            <field name="name">Expense Approval</field>
+            <field name="icon">fa-dollar</field>
+            <field name="res_model">hr.expense.sheet</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/hr_expense/data/mail_alias_data.xml b/addons/hr_expense/data/mail_alias_data.xml
new file mode 100644
index 00000000000..7c8470c5cb5
--- /dev/null
+++ b/addons/hr_expense/data/mail_alias_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- default alias for expenses -->
+        <record id="mail_alias_expense" model="mail.alias">
+            <field name="alias_name">expense</field>
+            <field name="alias_model_id" ref="model_hr_expense"/>
+            <field name="alias_user_id" ref="base.user_admin"/>
+            <field name="alias_contact">employees</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/hr_expense/data/mail_data.xml b/addons/hr_expense/data/mail_message_subtype_data.xml
similarity index 63%
rename from addons/hr_expense/data/mail_data.xml
rename to addons/hr_expense/data/mail_message_subtype_data.xml
index 72ed9f43ff8..ba954e6cfad 100644
--- a/addons/hr_expense/data/mail_data.xml
+++ b/addons/hr_expense/data/mail_message_subtype_data.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="mail_act_expense_approval" model="mail.activity.type">
-            <field name="name">Expense Approval</field>
-            <field name="icon">fa-dollar</field>
-            <field name="res_model">hr.expense.sheet</field>
-        </record>
-
-        <!-- default alias for expenses -->
-        <record id="mail_alias_expense" model="mail.alias">
-            <field name="alias_name">expense</field>
-            <field name="alias_model_id" ref="model_hr_expense"/>
-            <field name="alias_user_id" ref="base.user_admin"/>
-            <field name="alias_contact">employees</field>
-        </record>
-
         <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="mt_expense_approved" model="mail.message.subtype">
             <field name="name">Approved</field>
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 370f1859c2c..e08ad3d6e81 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -27,7 +27,8 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
     'depends': ['hr', 'calendar', 'resource'],
     'data': [
         'data/report_paperformat.xml',
-        'data/mail_data.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/hr_holidays_data.xml',
         'data/ir_cron_data.xml',
 
diff --git a/addons/hr_holidays/data/mail_activity_type_data.xml b/addons/hr_holidays/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..b5bac396e0d
--- /dev/null
+++ b/addons/hr_holidays/data/mail_activity_type_data.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Leave specific activities -->
+        <record id="mail_act_leave_approval" model="mail.activity.type">
+            <field name="name">Time Off Approval</field>
+            <field name="icon">fa-sun-o</field>
+            <field name="res_model">hr.leave</field>
+        </record>
+        <record id="mail_act_leave_second_approval" model="mail.activity.type">
+            <field name="name">Time Off Second Approve</field>
+            <field name="icon">fa-sun-o</field>
+            <field name="res_model">hr.leave</field>
+        </record>
+
+        <!-- Leave specific activities -->
+        <record id="mail_act_leave_allocation_approval" model="mail.activity.type">
+            <field name="name">Allocation Approval</field>
+            <field name="icon">fa-sun-o</field>
+            <field name="res_model">hr.leave.allocation</field>
+        </record>
+        <record id="mail_act_leave_allocation_second_approval" model="mail.activity.type">
+            <field name="name">Allocation Second Approve</field>
+            <field name="icon">fa-sun-o</field>
+            <field name="res_model">hr.leave.allocation</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/hr_holidays/data/mail_data.xml b/addons/hr_holidays/data/mail_message_subtype_data.xml
similarity index 56%
rename from addons/hr_holidays/data/mail_data.xml
rename to addons/hr_holidays/data/mail_message_subtype_data.xml
index c5d6c162b51..22c06844868 100644
--- a/addons/hr_holidays/data/mail_data.xml
+++ b/addons/hr_holidays/data/mail_message_subtype_data.xml
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <!-- Leave specific activities -->
-        <record id="mail_act_leave_approval" model="mail.activity.type">
-            <field name="name">Time Off Approval</field>
-            <field name="icon">fa-sun-o</field>
-            <field name="res_model">hr.leave</field>
-        </record>
-        <record id="mail_act_leave_second_approval" model="mail.activity.type">
-            <field name="name">Time Off Second Approve</field>
-            <field name="icon">fa-sun-o</field>
-            <field name="res_model">hr.leave</field>
-        </record>
-
-        <!-- Leave specific activities -->
-        <record id="mail_act_leave_allocation_approval" model="mail.activity.type">
-            <field name="name">Allocation Approval</field>
-            <field name="icon">fa-sun-o</field>
-            <field name="res_model">hr.leave.allocation</field>
-        </record>
-        <record id="mail_act_leave_allocation_second_approval" model="mail.activity.type">
-            <field name="name">Allocation Second Approve</field>
-            <field name="icon">fa-sun-o</field>
-            <field name="res_model">hr.leave.allocation</field>
-        </record>
-
         <!-- Holidays-related subtypes for messaging / Chatter -->
         <record id="mt_leave" model="mail.message.subtype">
             <field name="name">Time Off</field>
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index b23708310f7..77e5192064d 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -20,7 +20,8 @@
         'security/hr_recruitment_security.xml',
         'security/ir.model.access.csv',
         'data/digest_data.xml',
-        'data/mail_data.xml',
+        'data/mail_alias_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_template_data.xml',
         'data/mail_templates.xml',
         'data/hr_recruitment_data.xml',
diff --git a/addons/hr_recruitment/data/mail_alias_data.xml b/addons/hr_recruitment/data/mail_alias_data.xml
new file mode 100644
index 00000000000..8a3df2c9f23
--- /dev/null
+++ b/addons/hr_recruitment/data/mail_alias_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<odoo>
+<data noupdate="1">
+    <record id="mail_alias_jobs" model="mail.alias">
+        <field name="alias_name">jobs</field>
+        <field name="alias_model_id" ref="model_hr_applicant"/>
+        <field name="alias_user_id" ref="base.user_admin"/>
+        <field name="alias_parent_model_id" ref="model_hr_job"/>
+    </record>
+</data>
+</odoo>
diff --git a/addons/hr_recruitment/data/mail_data.xml b/addons/hr_recruitment/data/mail_message_subtype_data.xml
similarity index 90%
rename from addons/hr_recruitment/data/mail_data.xml
rename to addons/hr_recruitment/data/mail_message_subtype_data.xml
index f14f899c204..b255f071f7b 100644
--- a/addons/hr_recruitment/data/mail_data.xml
+++ b/addons/hr_recruitment/data/mail_message_subtype_data.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
 <data noupdate="1">
-
-    <record id="mail_alias_jobs" model="mail.alias">
-        <field name="alias_name">jobs</field>
-        <field name="alias_model_id" ref="model_hr_applicant"/>
-        <field name="alias_user_id" ref="base.user_admin"/>
-        <field name="alias_parent_model_id" ref="model_hr_job"/>
-    </record>
-
     <!-- Applicant-related subtypes for messaging / Chatter -->
     <record id="mt_applicant_new" model="mail.message.subtype">
         <field name="name">New Applicant</field>
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index e3c1bfdb1f4..428cfa36ed3 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -21,7 +21,7 @@ Help your customers with this chat, and analyse their feedback.
         "security/im_livechat_channel_security.xml",
         "security/ir.model.access.csv",
         "data/mail_shortcode_data.xml",
-        "data/mail_data.xml",
+        "data/mail_templates.xml",
         "data/im_livechat_channel_data.xml",
         "data/im_livechat_chatbot_data.xml",
         'data/digest_data.xml',
diff --git a/addons/im_livechat/data/mail_data.xml b/addons/im_livechat/data/mail_templates.xml
similarity index 100%
rename from addons/im_livechat/data/mail_data.xml
rename to addons/im_livechat/data/mail_templates.xml
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 561d3534771..002c3707485 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -61,7 +61,6 @@ For more specific needs, you may also assign custom-defined actions
     'website': 'https://www.odoo.com/app/discuss',
     'depends': ['base', 'base_setup', 'bus', 'web_tour'],
     'data': [
-        'data/fetchmail_data.xml',
         'data/mail_groups.xml',
         'wizard/mail_blacklist_remove_views.xml',
         'wizard/mail_compose_message_views.xml',
diff --git a/addons/mail/data/fetchmail_data.xml b/addons/mail/data/fetchmail_data.xml
deleted file mode 100644
index d98c3d1f92f..00000000000
--- a/addons/mail/data/fetchmail_data.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="ir_cron_mail_gateway_action" model="ir.cron">
-            <field name="name">Mail: Fetchmail Service</field>
-            <field name="model_id" ref="model_fetchmail_server"/>
-            <field name="state">code</field>
-            <field name="code">model._fetch_mails()</field>
-            <field name="interval_number">5</field>
-            <field name="interval_type">minutes</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <!-- Active flag is set on fetchmail_server.create/write -->
-            <field name="active" eval="False"/>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/mail/data/ir_cron_data.xml b/addons/mail/data/ir_cron_data.xml
index 2945e687420..8362160d762 100644
--- a/addons/mail/data/ir_cron_data.xml
+++ b/addons/mail/data/ir_cron_data.xml
@@ -42,5 +42,17 @@
             <field name="state">code</field>
         </record>
 
+        <record id="ir_cron_mail_gateway_action" model="ir.cron">
+            <field name="name">Mail: Fetchmail Service</field>
+            <field name="model_id" ref="model_fetchmail_server"/>
+            <field name="state">code</field>
+            <field name="code">model._fetch_mails()</field>
+            <field name="interval_number">5</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <!-- Active flag is set on fetchmail_server.create/write -->
+            <field name="active" eval="False"/>
+        </record>
     </data>
 </odoo>
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index 3449dec937d..8dcf13dd0a7 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -14,7 +14,9 @@
         'security/maintenance.xml',
         'security/ir.model.access.csv',
         'data/maintenance_data.xml',
-        'data/mail_data.xml',
+        'data/mail_alias_data.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_message_subtype_data.xml',
         'views/maintenance_views.xml',
         'views/mail_activity_views.xml',
         'data/maintenance_cron.xml',
diff --git a/addons/maintenance/data/mail_activity_type_data.xml b/addons/maintenance/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..1f31a1c9e2d
--- /dev/null
+++ b/addons/maintenance/data/mail_activity_type_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="1">
+    <!-- Maintenance-specific activities, for automatic generation mainly -->
+    <record id="mail_act_maintenance_request" model="mail.activity.type">
+        <field name="name">Maintenance Request</field>
+        <field name="icon">fa-wrench</field>
+        <field name="res_model">maintenance.request</field>
+    </record>
+</data>
+</odoo>
diff --git a/addons/maintenance/data/mail_alias_data.xml b/addons/maintenance/data/mail_alias_data.xml
new file mode 100644
index 00000000000..c0922547099
--- /dev/null
+++ b/addons/maintenance/data/mail_alias_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="1">
+    <!-- email alias for maintenance requests -->
+    <record id="mail_alias_equipment" model="mail.alias">
+        <field name="alias_name">helpdesk</field>
+        <field name="alias_model_id" ref="model_maintenance_request"/>
+        <field name="alias_user_id" ref="base.user_admin"/>
+    </record>
+</data>
+</odoo>
diff --git a/addons/maintenance/data/mail_data.xml b/addons/maintenance/data/mail_message_subtype_data.xml
similarity index 76%
rename from addons/maintenance/data/mail_data.xml
rename to addons/maintenance/data/mail_message_subtype_data.xml
index 0d9b18c9a9e..70b286ef39f 100644
--- a/addons/maintenance/data/mail_data.xml
+++ b/addons/maintenance/data/mail_message_subtype_data.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <data noupdate="1">
-    <!-- Maintenance-specific activities, for automatic generation mainly -->
-    <record id="mail_act_maintenance_request" model="mail.activity.type">
-        <field name="name">Maintenance Request</field>
-        <field name="icon">fa-wrench</field>
-        <field name="res_model">maintenance.request</field>
-    </record>
-
-    <!-- email alias for maintenance requests -->
-    <record id="mail_alias_equipment" model="mail.alias">
-        <field name="alias_name">helpdesk</field>
-        <field name="alias_model_id" ref="model_maintenance_request"/>
-        <field name="alias_user_id" ref="base.user_admin"/>
-    </record>
-
     <!-- Maintenance Request-related subtypes for messaging / Chatter -->
     <record id="mt_req_created" model="mail.message.subtype">
         <field name="name">Request Created</field>
diff --git a/addons/note/__manifest__.py b/addons/note/__manifest__.py
index ed4a5fd6d65..bb4ecebaee3 100644
--- a/addons/note/__manifest__.py
+++ b/addons/note/__manifest__.py
@@ -14,7 +14,7 @@
     'data': [
         'security/note_security.xml',
         'security/ir.model.access.csv',
-        'data/mail_activity_data.xml',
+        'data/mail_activity_type_data.xml',
         'data/note_data.xml',
         'data/res_users_data.xml',
         'views/note_views.xml',
diff --git a/addons/note/data/mail_activity_data.xml b/addons/note/data/mail_activity_type_data.xml
similarity index 100%
rename from addons/note/data/mail_activity_data.xml
rename to addons/note/data/mail_activity_type_data.xml
diff --git a/addons/product_expiry/__manifest__.py b/addons/product_expiry/__manifest__.py
index 2ff8acdd2d3..cbdf579abda 100644
--- a/addons/product_expiry/__manifest__.py
+++ b/addons/product_expiry/__manifest__.py
@@ -27,6 +27,8 @@ Also implements the removal strategy First Expiry First Out (FEFO) widely used,
              'report/report_deliveryslip.xml',
              'report/report_lot_barcode.xml',
              'report/report_package_barcode.xml',
-             'data/product_expiry_data.xml'],
+             'data/product_expiry_data.xml',
+             'data/mail_activity_type_data.xml',
+            ],
     'license': 'LGPL-3',
 }
diff --git a/addons/product_expiry/data/mail_activity_type_data.xml b/addons/product_expiry/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..4a40dbdb948
--- /dev/null
+++ b/addons/product_expiry/data/mail_activity_type_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="mail_activity_type_alert_date_reached" model="mail.activity.type">
+        <field name="name">Alert Date Reached</field>
+        <field name="category">default</field>
+        <field name="res_model">stock.lot</field>
+        <field name="icon">fa-tasks</field>
+        <field name="delay_count">0</field>
+    </record>
+</odoo>
diff --git a/addons/product_expiry/data/product_expiry_data.xml b/addons/product_expiry/data/product_expiry_data.xml
index 9cb695b5f2f..03609fb2e93 100644
--- a/addons/product_expiry/data/product_expiry_data.xml
+++ b/addons/product_expiry/data/product_expiry_data.xml
@@ -4,12 +4,4 @@
             <field name="name">First Expiry First Out (FEFO)</field>
             <field name="method">fefo</field>
         </record>
-        <record id="mail_activity_type_alert_date_reached" model="mail.activity.type">
-            <field name="name">Alert Date Reached</field>
-            <field name="category">default</field>
-            <field name="res_model">stock.lot</field>
-            <field name="icon">fa-tasks</field>
-            <field name="delay_count">0</field>
-        </record>
 </odoo>
-
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 29d45547987..2fc4fa7763d 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -44,7 +44,7 @@
         'views/project_task_templates.xml',
         'views/project_sharing_templates.xml',
         'data/ir_cron_data.xml',
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_template_data.xml',
         'data/project_data.xml',
         'wizard/project_task_type_delete_views.xml',
diff --git a/addons/project/data/mail_data.xml b/addons/project/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/project/data/mail_data.xml
rename to addons/project/data/mail_message_subtype_data.xml
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 8026aeacf9b..879890f0e83 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -22,7 +22,8 @@ This module contains all the common features of Sales Management and eCommerce.
         'report/sale_report_views.xml',
 
         'data/ir_sequence_data.xml',
-        'data/mail_data_various.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_template_data.xml',
         'data/sale_data.xml',
 
diff --git a/addons/sale/data/mail_activity_type_data.xml b/addons/sale/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..730202c88ce
--- /dev/null
+++ b/addons/sale/data/mail_activity_type_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Activities -->
+        <record id="mail_act_sale_upsell" model="mail.activity.type">
+            <field name="name">Order Upsell</field>
+            <field name="icon">fa-line-chart</field>
+            <field name="res_model">sale.order</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/sale/data/mail_data_various.xml b/addons/sale/data/mail_message_subtype_data.xml
similarity index 89%
rename from addons/sale/data/mail_data_various.xml
rename to addons/sale/data/mail_message_subtype_data.xml
index 0d6177b2f17..3203945ad6a 100644
--- a/addons/sale/data/mail_data_various.xml
+++ b/addons/sale/data/mail_message_subtype_data.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <!-- Activities -->
-        <record id="mail_act_sale_upsell" model="mail.activity.type">
-            <field name="name">Order Upsell</field>
-            <field name="icon">fa-line-chart</field>
-            <field name="res_model">sale.order</field>
-        </record>
-
         <!-- Sale-related subtypes for messaging / Chatter -->
         <record id="mt_order_sent" model="mail.message.subtype">
             <field name="name">Quotation sent</field>
diff --git a/addons/sale_purchase/__manifest__.py b/addons/sale_purchase/__manifest__.py
index a776c7e0993..246908cf239 100644
--- a/addons/sale_purchase/__manifest__.py
+++ b/addons/sale_purchase/__manifest__.py
@@ -16,7 +16,7 @@ by external providers and will automatically generate purchase orders directed t
         'purchase',
     ],
     'data': [
-        'data/mail_data.xml',
+        'data/mail_templates.xml',
         'views/product_views.xml',
         'views/sale_order_views.xml',
         'views/purchase_order_views.xml',
diff --git a/addons/sale_purchase/data/mail_data.xml b/addons/sale_purchase/data/mail_templates.xml
similarity index 100%
rename from addons/sale_purchase/data/mail_data.xml
rename to addons/sale_purchase/data/mail_templates.xml
diff --git a/addons/website_blog/__manifest__.py b/addons/website_blog/__manifest__.py
index 097ccfb2438..f58d1d9781c 100644
--- a/addons/website_blog/__manifest__.py
+++ b/addons/website_blog/__manifest__.py
@@ -10,7 +10,7 @@
     'version': '1.1',
     'depends': ['website_mail', 'website_partner'],
     'data': [
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_templates.xml',
         'data/website_blog_data.xml',
         'data/blog_snippet_template_data.xml',
diff --git a/addons/website_blog/data/mail_data.xml b/addons/website_blog/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/website_blog/data/mail_data.xml
rename to addons/website_blog/data/mail_message_subtype_data.xml
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index c21039525d1..5cc49d378a3 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -11,10 +11,10 @@
         'security/ir.model.access.csv',
         'security/event_track_security.xml',
         'data/event_data.xml',
-        'data/mail_data.xml',
         'data/mail_template_data.xml',
+        'data/mail_templates.xml',
+        'data/mail_message_subtype_data.xml',
         'data/event_track_data.xml',
-        'views/mail_templates.xml',
         'views/event_templates.xml',
         'views/event_track_templates_agenda.xml',
         'views/event_track_templates_list.xml',
diff --git a/addons/website_event_track/data/mail_data.xml b/addons/website_event_track/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/website_event_track/data/mail_data.xml
rename to addons/website_event_track/data/mail_message_subtype_data.xml
diff --git a/addons/website_event_track/views/mail_templates.xml b/addons/website_event_track/data/mail_templates.xml
similarity index 100%
rename from addons/website_event_track/views/mail_templates.xml
rename to addons/website_event_track/data/mail_templates.xml
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index 68f93d0e1c9..a2a8313edee 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -19,7 +19,7 @@ Ask questions, get answers, no distractions
     'data': [
         'data/forum_default_faq.xml',
         'data/forum_data.xml',
-        'data/mail_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_templates.xml',
         'views/forum.xml',
         'views/res_users_views.xml',
diff --git a/addons/website_forum/data/mail_data.xml b/addons/website_forum/data/mail_message_subtype_data.xml
similarity index 100%
rename from addons/website_forum/data/mail_data.xml
rename to addons/website_forum/data/mail_message_subtype_data.xml
diff --git a/addons/website_payment/__manifest__.py b/addons/website_payment/__manifest__.py
index e286ab7acd6..a0185b28c48 100644
--- a/addons/website_payment/__manifest__.py
+++ b/addons/website_payment/__manifest__.py
@@ -14,7 +14,8 @@ This is a bridge module that adds multi-website support for payment acquirers.
         'portal',
     ],
     'data': [
-        'data/donation_data.xml',
+        'data/mail_templates.xml',
+        'data/mail_template_data.xml',
         'data/ir_action_data.xml',
         'views/payment_acquirer.xml',
         'views/res_config_settings_views.xml',
diff --git a/addons/website_payment/data/mail_template_data.xml b/addons/website_payment/data/mail_template_data.xml
new file mode 100644
index 00000000000..ab7c8239cc1
--- /dev/null
+++ b/addons/website_payment/data/mail_template_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mail_template_donation" model="mail.template">
+            <field name="name">Donation</field>
+            <field name="model_id" ref="payment.model_payment_transaction" />
+            <field name="lang">{{ object.partner_id.lang }}</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/website_payment/data/donation_data.xml b/addons/website_payment/data/mail_templates.xml
similarity index 90%
rename from addons/website_payment/data/donation_data.xml
rename to addons/website_payment/data/mail_templates.xml
index 189c34dbcbc..e0fd147c6e1 100644
--- a/addons/website_payment/data/donation_data.xml
+++ b/addons/website_payment/data/mail_templates.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
-        <record id="mail_template_donation" model="mail.template">
-            <field name="name">Donation</field>
-            <field name="model_id" ref="payment.model_payment_transaction" />
-            <field name="lang">{{ object.partner_id.lang }}</field>
-        </record>
-    </data>
-
+<data noupdate="1">
     <template id="website_payment.donation_mail_body" name="Donation mail">
         <table border="0" cellpadding="0" style="background-color: white; padding: 0px; border-collapse:separate;">
             <tr style="height: 48px;"><td valign="top"><span style="font-size: 24px; font-weight: bold;">
@@ -64,4 +57,5 @@
             </td></tr>
         </table>
     </template>
+</data>
 </odoo>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 30fb086c955..e7642c7f5fc 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -50,7 +50,8 @@ Featuring
         'views/slide_channel_add.xml',
         'wizard/slide_channel_invite_views.xml',
         'data/gamification_data.xml',
-        'data/mail_data.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_message_subtype_data.xml',
         'data/mail_template_data.xml',
         'data/mail_templates.xml',
         'data/slide_data.xml',
diff --git a/addons/website_slides/data/mail_activity_type_data.xml b/addons/website_slides/data/mail_activity_type_data.xml
new file mode 100644
index 00000000000..62f94299d08
--- /dev/null
+++ b/addons/website_slides/data/mail_activity_type_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data noupdate="1">
+    <record id="mail_activity_data_access_request" model="mail.activity.type">
+        <field name="name">Access Request</field>
+        <field name="icon">fa-check-circle</field>
+        <field name="sequence">50</field>
+        <field name="res_model">slide.channel</field>
+    </record>
+</data></odoo>
diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_message_subtype_data.xml
similarity index 59%
rename from addons/website_slides/data/mail_data.xml
rename to addons/website_slides/data/mail_message_subtype_data.xml
index 69548124965..378744d78b0 100644
--- a/addons/website_slides/data/mail_data.xml
+++ b/addons/website_slides/data/mail_message_subtype_data.xml
@@ -7,11 +7,4 @@
         <field name="default" eval="True"/>
         <field name="description">Presentation Published</field>
     </record>
-
-    <record id="mail_activity_data_access_request" model="mail.activity.type">
-        <field name="name">Access Request</field>
-        <field name="icon">fa-check-circle</field>
-        <field name="sequence">50</field>
-        <field name="res_model">slide.channel</field>
-    </record>
 </data></odoo>