diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 22849a9b886..7689ca2c253 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -560,11 +560,7 @@
             <field name="name">Invoice</field>
             <field name="object">account.invoice</field>
         </record>
-        <record id="mail.analytic_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
-            <field name="res_model">account.analytic.account</field>
-            <field name="default" eval="False"/>
-        </record>
+        
         <record id="mail.invoice_subtype_new" model="mail.message.subtype">
             <field name="name">new</field>
             <field name="res_model">account.invoice</field>
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 10762a1d2be..d90b2fd62ac 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -38,7 +38,8 @@ that have no counterpart in the general financial accounts.
         'security/analytic_security.xml',
         'security/ir.model.access.csv',
         'analytic_sequence.xml',
-        'analytic_view.xml'
+        'analytic_view.xml',
+        'analytic_data.xml'
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/analytic/analytic_data.xml b/addons/analytic/analytic_data.xml
new file mode 100644
index 00000000000..cfd3b5e9b78
--- /dev/null
+++ b/addons/analytic/analytic_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="mail.analytic_subtype_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/base_status/base_stage.py b/addons/base_status/base_stage.py
index f72168cde46..4b1cc3c6946 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -367,21 +367,24 @@ class base_stage(object):
         subtype_obj = self.pool.get('mail.message.subtype')
         irmodel_obj = self.pool.get('ir.model.data')
         subtype_id = subtype_obj.search(cr,uid,[('res_model','=',self._name),('name','=',name)])
-        ir_ids = irmodel_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','=',subtype_id)])
+        ir_ids = irmodel_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','in',subtype_id)])
+        xml_id = False
         ir_model_browse = irmodel_obj.browse(cr,uid,ir_ids)
-        return ir_model_browse.name
+        if ir_model_browse:
+            xml_id = ir_model_browse[0].name
+        return xml_id
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            xml_id = self.find_xml_id(cr, uid, ids, name="closed", context)
+            xml_id = self.find_xml_id(cr, uid, ids, name="closed", context=context)
             self.message_post(cr, uid, [id], body=msg, subtype_xml_id=xml_id, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>cancelled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            xml_id = self.find_xml_id(cr, uid, ids, name="cancelled", context)
+            xml_id = self.find_xml_id(cr, uid, ids, name="cancelled", context=context)
             self.message_post(cr, uid, [id], body=msg, subtype_xml_id=xml_id, context=context)
         return True
 
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 252e843cf30..633782ed233 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -174,5 +174,10 @@
             <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>