diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5e8b5dfaf5d..3011fc6c6c2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1398,7 +1398,7 @@ class stock_picking(osv.osv):
 
     def ship_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 has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype="cancel", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype="cancelled", context=context)
 
 
 stock_picking()
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index a24502ab361..976c89ad06f 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -181,7 +181,7 @@ watch your stock valuation, and track production lots upstream and downstream (b
             <field name="name">close</field>
             <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
         </record>
-        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+        <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">