diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index cc6e5f71f30..ba85a62ca1d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1028,7 +1028,7 @@ class sale_order(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=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), subtype_xml_id="sale_subtype_new", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), subtype_xml_id="mt_sale_new", context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
@@ -1036,7 +1036,7 @@ class sale_order(osv.osv):
 
     def 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=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), subtype_xml_id="sale_subtype_cancelled", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
     def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -1048,7 +1048,7 @@ class sale_order(osv.osv):
                 self.message_post(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
 
     def delivery_end_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Order <b>delivered</b>."), subtype_xml_id="sale_subtype_delivered", context=context)
+        self.message_post(cr, uid, ids, body=_("Order <b>delivered</b>."), subtype_xml_id="mt_sale_delivered", context=context)
 
     def invoice_paid_send_note(self, cr, uid, ids, context=None):
         self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), subtype_xml_id="sale_subtype_paid", context=context)
@@ -1056,7 +1056,7 @@ class sale_order(osv.osv):
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), subtype_xml_id="sale_subtype_pending", context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def action_cancel_draft_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_('Sale order set to draft.'), context=context)
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4337c4bd1e8..3be79035fc6 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -44,26 +44,16 @@
 If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.</value>
         </function>
         
-        <record id="mail.sale_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
+        <record id="mail.mt_sale_new" model="mail.message.subtype">
+            <field name="name">create</field>
             <field name="res_model">sale.order</field>
             <field name="default" eval="False"/>
         </record>
-        <record id="mail.sale_subtype_cancelled" model="mail.message.subtype">
-            <field name="name">cancelled</field>
-            <field name="res_model">sale.order</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mail.sale_subtype_paid" model="mail.message.subtype">
+        <record id="mail.mt_sale_paid" model="mail.message.subtype">
             <field name="name">paid</field>
             <field name="res_model">sale.order</field>
         </record>
-        <record id="mail.sale_subtype_pending" model="mail.message.subtype">
-            <field name="name">pending</field>
-            <field name="res_model">sale.order</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mail.sale_subtype_delivered" model="mail.message.subtype">
+        <record id="mail.mt_sale_delivered" model="mail.message.subtype">
             <field name="name">delivered</field>
             <field name="res_model">sale.order</field>
         </record>