diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 5860dabd53c..ca5786aefe9 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -11,14 +11,14 @@ This module contains all the common features of Sales Management and eCommerce.
     """,
     'depends': ['sales_team', 'account', 'portal'],
     'data': [
-        'data/ir_sequence_data.xml',
-        'data/sale_data.xml',
         'report/sale_report.xml',
-        'data/mail_template_data.xml',
         'report/sale_report_views.xml',
         'report/sale_report_templates.xml',
         'report/invoice_report_templates.xml',
         'report/report_all_channels_sales_views.xml',
+        'data/ir_sequence_data.xml',
+        'data/sale_data.xml',
+        'data/mail_data.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/sale_make_invoice_advance_views.xml',
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_data.xml
similarity index 54%
rename from addons/sale/data/mail_template_data.xml
rename to addons/sale/data/mail_data.xml
index b1ee2412b94..238bb55d2f2 100644
--- a/addons/sale/data/mail_template_data.xml
+++ b/addons/sale/data/mail_data.xml
@@ -1,6 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <!-- Sale-related subtypes for messaging / Chatter -->
+        <record id="mt_order_sent" model="mail.message.subtype">
+            <field name="name">Quotation sent</field>
+            <field name="res_model">sale.order</field>
+            <field name="default" eval="False"/>
+            <field name="description">Quotation sent</field>
+        </record>
+        <record id="mt_order_confirmed" model="mail.message.subtype">
+            <field name="name">Sales Order Confirmed</field>
+            <field name="res_model">sale.order</field>
+            <field name="default" eval="False"/>
+            <field name="description">Quotation confirmed</field>
+        </record>
+
+        <!-- Salesteam-related subtypes for messaging / Chatter -->
+        <record id="mt_salesteam_order_sent" model="mail.message.subtype">
+            <field name="name">Quotation sent</field>
+            <field name="sequence">20</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
+            <field name="relation_field">team_id</field>
+        </record>
+        <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
+            <field name="name">Sales Order Confirmed</field>
+            <field name="sequence">21</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
+            <field name="relation_field">team_id</field>
+        </record>
+        <record id="mt_salesteam_invoice_created" model="mail.message.subtype">
+            <field name="name">Invoice Created</field>
+            <field name="sequence">22</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('account.mt_invoice_created')"/>
+            <field name="relation_field">team_id</field>
+        </record>
+        <record id="mt_salesteam_invoice_confirmed" model="mail.message.subtype">
+            <field name="name">Invoice Confirmed</field>
+            <field name="sequence">23</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('account.mt_invoice_validated')"/>
+            <field name="relation_field">team_id</field>
+        </record>
 
         <!--Email template -->
         <record id="email_template_edi_sale" model="mail.template">
diff --git a/addons/sale/data/sale_data.xml b/addons/sale/data/sale_data.xml
index a036f5acef2..651931d8625 100644
--- a/addons/sale/data/sale_data.xml
+++ b/addons/sale/data/sale_data.xml
@@ -7,49 +7,6 @@
             <field name="dashboard_graph_model">sale.report</field>
         </record>
 
-        <!-- Sale-related subtypes for messaging / Chatter -->
-        <record id="mt_order_sent" model="mail.message.subtype">
-            <field name="name">Quotation sent</field>
-            <field name="res_model">sale.order</field>
-            <field name="default" eval="False"/>
-            <field name="description">Quotation sent</field>
-        </record>
-        <record id="mt_order_confirmed" model="mail.message.subtype">
-            <field name="name">Sales Order Confirmed</field>
-            <field name="res_model">sale.order</field>
-            <field name="default" eval="False"/>
-            <field name="description">Quotation confirmed</field>
-        </record>
-
-        <!-- Salesteam-related subtypes for messaging / Chatter -->
-        <record id="mt_salesteam_order_sent" model="mail.message.subtype">
-            <field name="name">Quotation sent</field>
-            <field name="sequence">20</field>
-            <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
-            <field name="relation_field">team_id</field>
-        </record>
-        <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
-            <field name="name">Sales Order Confirmed</field>
-            <field name="sequence">21</field>
-            <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
-            <field name="relation_field">team_id</field>
-        </record>
-        <record id="mt_salesteam_invoice_created" model="mail.message.subtype">
-            <field name="name">Invoice Created</field>
-            <field name="sequence">22</field>
-            <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('account.mt_invoice_created')"/>
-            <field name="relation_field">team_id</field>
-        </record>
-        <record id="mt_salesteam_invoice_confirmed" model="mail.message.subtype">
-            <field name="name">Invoice Confirmed</field>
-            <field name="sequence">23</field>
-            <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('account.mt_invoice_validated')"/>
-            <field name="relation_field">team_id</field>
-        </record>
         <record id="sale_layout_cat_1" model="sale.layout_category">
             <field name="name">Services</field>
             <field name="subtotal" eval="True"></field>