diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 62bfd8edb02..5a0b4f5ee34 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -32,7 +32,8 @@
         'views/res_config_settings_views.xml',
         'data/res_partner_data.xml',
         'data/mail_message_subtype_data.xml',
-        'data/mail_templates.xml',
+        'data/mail_templates_chatter.xml',
+        'data/mail_templates_email_layouts.xml',
         'data/mail_channel_data.xml',
         'data/mail_activity_data.xml',
         'data/ir_cron_data.xml',
diff --git a/addons/mail/data/mail_templates_chatter.xml b/addons/mail/data/mail_templates_chatter.xml
new file mode 100644
index 00000000000..6335f22eccd
--- /dev/null
+++ b/addons/mail/data/mail_templates_chatter.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- Discuss utility templates for notifications -->
+        <template id="message_user_assigned">
+<p style="margin: 0px;">
+    <span>Dear <t t-esc="object.user_id.sudo().name"/>,</span><br />
+    <span style="margin-top: 8px;">You have been assigned to the <t t-esc="model_description or 'document'"/> <t t-esc="object.display_name"/>.</span>
+</p>
+<p style="padding-top: 24px; padding-bottom: 16px;">
+    <a t-att-href="access_link" t-att-data-oe-model="object._name" t-att-data-oe-id="object.id" style="background-color:#875A7B; padding: 10px; text-decoration: none; color: #fff; border-radius: 5px;">
+            View <t t-esc="model_description or 'document'"/>
+    </a>
+</p>
+        </template>
+
+        <template id="message_activity_done">
+<div>
+    <p>
+        <span t-attf-class="fa #{activity.activity_type_id.icon} fa-fw"/><span t-field="activity.activity_type_id.name"/> done
+        <t t-if="display_assignee"> (originally assigned to <span t-field="activity.user_id.name"/>)</t>
+        <span t-if="activity.summary">: </span><span t-if="activity.summary" t-field="activity.summary"/>
+    </p>
+    <div t-if="feedback">
+        <t t-foreach="feedback.split('\n')" t-as="feedback_line">
+            <t t-esc="feedback_line"/>
+            <br t-if="not feedback_line_last"/>
+        </t>
+    </div>
+    <t t-if="activity.note and activity.note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'"><!-- <p></br></p> -->
+        <div class="o_mail_note_title"><strong>Original note:</strong></div>
+        <div t-field="activity.note"/>
+    </t>
+</div>
+        </template>
+
+        <template id="message_activity_assigned">
+<div style="margin: 0px; padding: 0px; font-size: 13px;">
+    <span t-field="activity.create_uid.name"/> assigned you an activity <span t-field="activity.activity_type_id.name"/>
+    <t t-if="activity.summary">(<span t-field="activity.summary"/>)</t>
+    on <span t-field="activity.res_name"/>
+    to close for <span t-field="activity.date_deadline"/>.<br />
+    <p style="padding: 16px 0px 16px 0px;">
+        <a t-att-href="access_link" t-att-data-oe-model="activity.res_model" t-att-data-oe-id="activity.res_id"
+            style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
+            View <t t-esc="model_description or 'document'"/>
+        </a>
+    </p>
+    <div t-if="activity.note" style="margin-top: 8px;" t-field="activity.note"/>
+</div>
+        </template>
+
+        <template id="message_origin_link">
+            <p>
+                <t t-if="edit">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been modified from:</t>
+                <t t-else="">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been created from:</t>
+                <t t-foreach="origin" t-as="o">
+                    <a href="#" t-att-data-oe-model="o._name" t-att-data-oe-id="o.id"> <t t-esc="o.display_name"/></a><span t-if="origin.ids[-1:] != o.ids">, </span>
+                </t>
+            </p>
+        </template>
+
+        <!-- Mail gateway templates -->
+        <template id="mail_bounce_catchall">
+<div>
+    <p>Hello <t t-esc="message['email_from']"/>,</p>
+    <p>The email sent to <t t-esc="message['to']"/> cannot be processed. This address
+    is used to collect replies and should not be used to directly contact <t t-esc="res_company.name"/>.</p>
+    <p>Please contact us instead using <a t-att-href="'mailto:%s' % res_company.email"><t t-esc="res_company.email"/></a></p>
+    <p>Regards,</p>
+    <p>The <t t-esc="res_company.name"/> team.</p>
+</div>
+<blockquote><t t-esc="message['body']"/></blockquote>
+        </template>
+
+        <!-- Mail bounce alias mail template -->
+        <template id="mail_bounce_alias_security">
+<div><t t-out="body"/></div>
+<blockquote><t t-out="message['body']"/></blockquote>
+        </template>
+
+    </data>
+</odoo>
diff --git a/addons/mail/data/mail_templates.xml b/addons/mail/data/mail_templates_email_layouts.xml
similarity index 78%
rename from addons/mail/data/mail_templates.xml
rename to addons/mail/data/mail_templates_email_layouts.xml
index dba8cb7e893..3b293be0937 100644
--- a/addons/mail/data/mail_templates.xml
+++ b/addons/mail/data/mail_templates_email_layouts.xml
@@ -263,83 +263,5 @@
 </td></tr>
 </table>
         </template>
-
-        <!-- Discuss utility templates for notifications -->
-        <template id="message_user_assigned">
-<p style="margin: 0px;">
-    <span>Dear <t t-esc="object.user_id.sudo().name"/>,</span><br />
-    <span style="margin-top: 8px;">You have been assigned to the <t t-esc="model_description or 'document'"/> <t t-esc="object.display_name"/>.</span>
-</p>
-<p style="padding-top: 24px; padding-bottom: 16px;">
-    <a t-att-href="access_link" t-att-data-oe-model="object._name" t-att-data-oe-id="object.id" style="background-color:#875A7B; padding: 10px; text-decoration: none; color: #fff; border-radius: 5px;">
-            View <t t-esc="model_description or 'document'"/>
-    </a>
-</p>
-        </template>
-
-        <template id="message_activity_done">
-<div>
-    <p>
-        <span t-attf-class="fa #{activity.activity_type_id.icon} fa-fw"/><span t-field="activity.activity_type_id.name"/> done
-        <t t-if="display_assignee"> (originally assigned to <span t-field="activity.user_id.name"/>)</t>
-        <span t-if="activity.summary">: </span><span t-if="activity.summary" t-field="activity.summary"/>
-    </p>
-    <div t-if="feedback">
-        <t t-foreach="feedback.split('\n')" t-as="feedback_line">
-            <t t-esc="feedback_line"/>
-            <br t-if="not feedback_line_last"/>
-        </t>
-    </div>
-    <t t-if="activity.note and activity.note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'"><!-- <p></br></p> -->
-        <div class="o_mail_note_title"><strong>Original note:</strong></div>
-        <div t-field="activity.note"/>
-    </t>
-</div>
-        </template>
-
-        <template id="message_activity_assigned">
-<div style="margin: 0px; padding: 0px; font-size: 13px;">
-    <span t-field="activity.create_uid.name"/> assigned you an activity <span t-field="activity.activity_type_id.name"/>
-    <t t-if="activity.summary">(<span t-field="activity.summary"/>)</t>
-    on <span t-field="activity.res_name"/>
-    to close for <span t-field="activity.date_deadline"/>.<br />
-    <p style="padding: 16px 0px 16px 0px;">
-        <a t-att-href="access_link" t-att-data-oe-model="activity.res_model" t-att-data-oe-id="activity.res_id"
-            style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
-            View <t t-esc="model_description or 'document'"/>
-        </a>
-    </p>
-    <div t-if="activity.note" style="margin-top: 8px;" t-field="activity.note"/>
-</div>
-        </template>
-
-        <template id="message_origin_link">
-            <p>
-                <t t-if="edit">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been modified from:</t>
-                <t t-else="">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been created from:</t>
-                <t t-foreach="origin" t-as="o">
-                    <a href="#" t-att-data-oe-model="o._name" t-att-data-oe-id="o.id"> <t t-esc="o.display_name"/></a><span t-if="origin.ids[-1:] != o.ids">, </span>
-                </t>
-            </p>
-        </template>
-
-        <!-- Mail gateway templates -->
-        <template id="mail_bounce_catchall">
-<div>
-    <p>Hello <t t-esc="message['email_from']"/>,</p>
-    <p>The email sent to <t t-esc="message['to']"/> cannot be processed. This address
-    is used to collect replies and should not be used to directly contact <t t-esc="res_company.name"/>.</p>
-    <p>Please contact us instead using <a t-att-href="'mailto:%s' % res_company.email"><t t-esc="res_company.email"/></a></p>
-    <p>Regards,</p>
-    <p>The <t t-esc="res_company.name"/> team.</p>
-</div>
-<blockquote><t t-esc="message['body']"/></blockquote>
-        </template>
-
-        <!-- Mail bounce alias mail template -->
-        <template id="mail_bounce_alias_security">
-<div><t t-out="body"/></div>
-<blockquote><t t-out="message['body']"/></blockquote>
-        </template>
     </data>
 </odoo>