diff --git a/addons/maintenance/data/mail_data.xml b/addons/maintenance/data/mail_data.xml
index dd80a831723..4879b198571 100644
--- a/addons/maintenance/data/mail_data.xml
+++ b/addons/maintenance/data/mail_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
+<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>
diff --git a/addons/project/data/project_data.xml b/addons/project/data/project_data.xml
index ff624b5a232..7198ffe017b 100644
--- a/addons/project/data/project_data.xml
+++ b/addons/project/data/project_data.xml
@@ -21,9 +21,6 @@
             <field name="numbercall">-1</field>
         </record>
 
-    </data>
-
-
         <!-- Task-related subtypes for messaging / Chatter -->
         <record id="mt_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
@@ -97,6 +94,7 @@
             <field name="parent_id" eval="ref('mt_task_rating')"/>
             <field name="relation_field">project_id</field>
         </record>
+    </data>
 
     <data noupdate="1">
 
diff --git a/addons/stock_picking_batch/data/stock_picking_batch_data.xml b/addons/stock_picking_batch/data/stock_picking_batch_data.xml
index 9c22ab97778..ea5c953fb47 100644
--- a/addons/stock_picking_batch/data/stock_picking_batch_data.xml
+++ b/addons/stock_picking_batch/data/stock_picking_batch_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
+<odoo><data noupdate="1">
     <!-- Batch picking related subtypes for messaging / Chatter -->
     <record id="mt_batch_state" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
@@ -16,4 +15,4 @@
         <field name="padding">5</field>
         <field name="company_id" eval="False"/>
     </record>
-</odoo>
+</data></odoo>
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index ac9421bb472..3438ae7a870 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -31,6 +31,14 @@
             <field name="type">url</field>
             <field name="url">/website_blog/static/src/img/demo/blog_post_cover_2.jpg</field>
         </record>
+
+        <!-- Blog-related subtypes for messaging / Chatter -->
+        <record id="mt_blog_blog_published" model="mail.message.subtype">
+            <field name="name">Published Post</field>
+            <field name="res_model">blog.blog</field>
+            <field name="default" eval="True"/>
+            <field name="description">Published Post</field>
+        </record>
     </data>
 
     <data>
@@ -46,13 +54,5 @@
             <field name="state">open</field>
         </record>
 
-        <!-- Blog-related subtypes for messaging / Chatter -->
-        <record id="mt_blog_blog_published" model="mail.message.subtype">
-            <field name="name">Published Post</field>
-            <field name="res_model">blog.blog</field>
-            <field name="default" eval="True"/>
-            <field name="description">Published Post</field>
-        </record>
-
     </data>
 </odoo>
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 4196804495a..c07e95c063f 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -22,6 +22,8 @@
             <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/>
         </record>
 
+    </data>
+    <data noupdate="1">
         <!-- Answers subtypes -->
         <record id="mt_answer_new" model="mail.message.subtype">
             <field name="name">New Answer</field>
@@ -67,9 +69,6 @@
             <field name="relation_field">forum_id</field>
         </record>
 
-    </data>
-    <data noupdate="1">
-
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_forum"/>
             <field name="state">open</field>