diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b8f3a9071a0..a145e5c06be 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1306,16 +1306,19 @@ class account_invoice(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), subtype_xml_id="analytic_subtype_new", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)),
+                subtype_xml_id="mt_invoice_new", context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
          for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), subtype_xml_id="invoice_subtype_paid", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)),
+                subtype_xml_id="mt_invoice_paid", context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype_xml_id="invoice_subtype_cancelled", context=context)
-account_invoice()
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)),
+                context=context)
+
 
 class account_invoice_line(osv.osv):
 
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 7689ca2c253..007ef33c8c2 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -560,20 +560,15 @@
             <field name="name">Invoice</field>
             <field name="object">account.invoice</field>
         </record>
-        
-        <record id="mail.invoice_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
+
+        <!-- mail: subtypes -->
+        <record id="mail.mt_invoice_new" model="mail.message.subtype">
+            <field name="name">created</field>
             <field name="res_model">account.invoice</field>
-            <field name="default" eval="False"/>
         </record>
-        <record id="mail.invoice_subtype_paid" model="mail.message.subtype">
+        <record id="mail.mt_invoice_paid" model="mail.message.subtype">
             <field name="name">paid</field>
             <field name="res_model">account.invoice</field>
         </record>
-        <record id="mail.invoice_subtype_cancelled" model="mail.message.subtype">
-            <field name="name">cancelled</field>
-            <field name="res_model">account.invoice</field>
-            <field name="default" eval="False"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 05a75f5847d..632367b74bc 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1295,17 +1295,17 @@ class account_voucher(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>created</b>." % self._document_type[obj.type or False]
-            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="voucher_subtype_new", context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="mt_voucher_new", context=context)
 
     def post_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
-            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="voucher_subtype_post", context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="mt_voucher_post", context=context)
 
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
-            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="voucher_subtype_reconcile", context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype_xml_id="mt_voucher_reconciled", context=context)
 
 account_voucher()
 
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index a59993aae6b..b69a694faff 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -12,18 +12,18 @@ You can track customer payments easily and automate the reminders. You get an ov
 If you want to use advanced accounting features, you should install the "Accounting and Finance" module.</value>
             <value>Module eInvoicing &amp; Payments has been installed.</value>
         </function>
-        <!-- Message Sub Type -->
-        <record id="mail.voucher_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
+
+        <!-- mail: subtypes -->
+        <record id="mail.mt_voucher_new" model="mail.message.subtype">
+            <field name="name">created</field>
             <field name="res_model">account.voucher</field>
         </record>
-        <record id="mail.voucher_subtype_post" model="mail.message.subtype">
+        <record id="mail.mt_voucher_post" model="mail.message.subtype">
             <field name="name">post</field>
             <field name="res_model">account.voucher</field>
-            <field name="default" eval="False"/>
         </record>
-        <record id="mail.voucher_subtype_reconcile" model="mail.message.subtype">
-            <field name="name">reconcile</field>
+        <record id="mail.mt_voucher_reconciled" model="mail.message.subtype">
+            <field name="name">reconciled</field>
             <field name="res_model">account.voucher</field>
             <field name="default" eval="False"/>
         </record>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 250ad98a603..0aa6b5406c0 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -281,7 +281,8 @@ class account_analytic_account(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), subtype_xml_id="analytic_subtype_new", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name),
+                subtype_xml_id="mt_account_new", context=context)
 
 account_analytic_account()
 
diff --git a/addons/analytic/analytic_data.xml b/addons/analytic/analytic_data.xml
index cfd3b5e9b78..1bee414e66a 100644
--- a/addons/analytic/analytic_data.xml
+++ b/addons/analytic/analytic_data.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="mail.analytic_subtype_new" model="mail.message.subtype">
+
+        <!-- mail: subtypes -->
+        <record id="mail.mt_account_new" model="mail.message.subtype">
             <field name="name">new</field>
             <field name="res_model">account.analytic.account</field>
-            <field name="default" eval="False"/>
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
index 812ce3da536..45d79860b0e 100644
--- a/addons/mrp_operations/mrp_operation_data.xml
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -30,27 +30,18 @@
         <field name="start_stop">done</field>
     </record>
 
-    <!-- SUBTYPE -->
-    <record id="mail.mrp_operations_subtype_new" model="mail.message.subtype">
+    <!-- mail: subtypes -->
+    <record id="mail.mt_workcenter_new" model="mail.message.subtype">
         <field name="name">new</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="default" eval="False"/>
     </record>
-    <record id="mail.mrp_operations_subtype_started" model="mail.message.subtype">
-        <field name="name">started</field>
+    <record id="mail.mt_workcenter_canceled" model="mail.message.subtype">
+        <field name="name">canceled</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="default" eval="False"/>
     </record>
-    <record id="mail.mrp_operations_subtype_pending" model="mail.message.subtype">
-        <field name="name">pending</field>
-        <field name="res_model">mrp.production.workcenter.line</field>
-    </record>
-    <record id="mail.mrp_operations_subtype_cancelled" model="mail.message.subtype">
-        <field name="name">cancelled</field>
-        <field name="res_model">mrp.production.workcenter.line</field>
-        <field name="default" eval="False"/>
-    </record>
-    <record id="mail.mrp_operations_subtype_closed" model="mail.message.subtype">
+    <record id="mail.mt_workcenter_closed" model="mail.message.subtype">
         <field name="name">closed</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="default" eval="False"/>
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 53eaceed066..efac450f7f2 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -224,7 +224,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>created</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mrp_operations_subtype_new", context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mt_workcenter_new", context=context)
         return True
 
     def action_start_send_note(self, cr, uid, ids, context=None):
@@ -232,7 +232,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>started</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mrp_operations_subtype_started", context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
@@ -240,7 +240,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>done</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mrp_operations_subtype_closed", context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mt_workcenter_closed", context=context)
         return True
 
     def action_pending_send_note(self, cr, uid, ids, context=None):
@@ -248,7 +248,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order is <b>pending</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mrp_operations_subtype_pending", context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
@@ -256,7 +256,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>cancelled</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mrp_operations_subtype_cancelled", context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, subtype_xml_id="mt_workcenter_canceled", context=context)
         return True
 
 mrp_production_workcenter_line()