diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 81ca828dc76..a7337b7178f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -842,7 +842,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype_xml_id="crm_subtype_stage_change",context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype_xml_id="mt_crm_stage",context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
@@ -852,16 +852,16 @@ class crm_lead(base_stage, format_address, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=message, subtype_xml_id="crm_subtype_new", context=context)
+            self.message_post(cr, uid, [id], body=message, subtype_xml_id="mt_crm_new", context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_post(cr, uid, ids, body=message,subtype_xml_id="crm_subtype_lost", context=context)
+        return self.message_post(cr, uid, ids, body=message,subtype_xml_id="mt_crm_lost", context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_post(cr, uid, ids, body=message, subtype_xml_id="crm_subtype_won", context=context)
+        return self.message_post(cr, uid, ids, body=message, subtype_xml_id="mt_crm_won", context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 633782ed233..e347a7a03af 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -155,29 +155,24 @@
         </record>
 
         <!--  mail subtype -->
-        <record id="mail.crm_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
+        <record id="mail.mt_crm_new" model="mail.message.subtype">
+            <field name="name">created</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail.crm_subtype_won" model="mail.message.subtype">
+        <record id="mail.mt_crm_won" model="mail.message.subtype">
             <field name="name">won</field>
             <field name="res_model">crm.lead</field>
         </record>
-        <record id="mail.crm_subtype_lost" model="mail.message.subtype">
+        <record id="mail.mt_crm_lost" model="mail.message.subtype">
             <field name="name">lost</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail.crm_subtype_stage_change" model="mail.message.subtype">
+        <record id="mail.mt_crm_stage" model="mail.message.subtype">
             <field name="name">stage change</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail.crm_subtype_cancelled" model="mail.message.subtype">
-            <field name="name">cancelled</field>
-            <field name="res_model">crm.lead</field>
-            <field name="default" eval="False"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index ce2427b9752..fc80e320c08 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -238,16 +238,16 @@ class crm_claim(base_stage, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>created</b>.')
-        return self.message_post(cr, uid, ids, body=msg, subtype_xml_id='claim_subtype_new', context=context)
+        return self.message_post(cr, uid, ids, body=msg, subtype_xml_id='mt_claim_new', context=context)
 
     def case_refuse_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>refused</b>.')
-        return self.message_post(cr, uid, ids, body=msg, subtype_xml_id='claim_subtype_refused', context=context)
+        return self.message_post(cr, uid, ids, body=msg, subtype_xml_id='mt_claim_refused', context=context)
 
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.claim.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype_xml_id='claim_subtype_stage_change', context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype_xml_id='mt_claim_stage', context=context)
 
 
 class res_partner(osv.osv):
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index e68bc3ad6cb..5e79220aea8 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -76,30 +76,24 @@
             <field name="fold" eval="True"/>
         </record>
         
-            <!-- SUBTYPE -->
-    <record id="mail.claim_subtype_new" model="mail.message.subtype">
-        <field name="name">new</field>
-        <field name="res_model">crm.claim</field>
-        <field name="default" eval="False"/>
-    </record>
-    <record id="mail.claim_subtype_refused" model="mail.message.subtype">
-        <field name="name">refused</field>
-        <field name="res_model">crm.claim</field>
-        <field name="default" eval="False"/>
-    </record>
-    <record id="mail.claim_subtype_stage_change" model="mail.message.subtype">
-        <field name="name">stage change</field>
-        <field name="res_model">crm.claim</field>
-    </record>
-    <record id="mail.claim_subtype_cancelled" model="mail.message.subtype">
-        <field name="name">cancelled</field>
-        <field name="res_model">crm.claim</field>
-        <field name="default" eval="False"/>
-    </record>
-    <record id="mail.claim_subtype_closed" model="mail.message.subtype">
-        <field name="name">closed</field>
-        <field name="res_model">crm.claim</field>
-    </record>
+        <!-- mail subtypes -->
+        <record id="mail.mt_claim_new" model="mail.message.subtype">
+            <field name="name">created</field>
+            <field name="res_model">crm.claim</field>
+        </record>
+        <record id="mail.mt_claim_refused" model="mail.message.subtype">
+            <field name="name">refused</field>
+            <field name="res_model">crm.claim</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mt_claim_stage" model="mail.message.subtype">
+            <field name="name">stage change</field>
+            <field name="res_model">crm.claim</field>
+        </record>
+        <record id="mail.mt_claim_closed" model="mail.message.subtype">
+            <field name="name">closed</field>
+            <field name="res_model">crm.claim</field>
+        </record>
 
     </data>
 </openerp>