diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 83eddb83d5e..0677fbfbd75 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -503,7 +503,7 @@ class project_issue(base_stage, 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('project.task.type').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="issue_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_issue_new", context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ Override of default prefix for notifications. """
@@ -515,7 +515,7 @@ class project_issue(base_stage, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Project issue <b>created</b>.")
-        return self.message_post(cr, uid, ids, body=message, subtype_xml_id="issue_subtype_new", context=context)
+        return self.message_post(cr, uid, ids, body=message, subtype_xml_id="mt_issue_new", context=context)
 
     def case_escalate_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index f6c225a4d00..edd44e52dd2 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -30,27 +30,7 @@
         <record model="project.issue.version" id="type3">
             <field name="name">v3.0</field>
         </record>
-        
-        <!--Sub type Data -->
-        <record id="mail.issue_subtype_new" model="mail.message.subtype">
-            <field name="name">new</field>
-            <field name="res_model">project.issue</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mail.issue_subtype_stage_change" model="mail.message.subtype">
-            <field name="name">stage change</field>
-            <field name="res_model">project.issue</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mail.issue_subtype_cancelled" model="mail.message.subtype">
-            <field name="name">cancelled</field>
-            <field name="res_model">project.issue</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mail.issue_subtype_closed" model="mail.message.subtype">
-            <field name="name">closed</field>
-            <field name="res_model">project.issue</field>
-        </record>
+
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
             <field name="model">mail.group</field>
@@ -62,5 +42,21 @@ You can record issues, assign them to a responsible person, and keep track of th
 Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</field>
         </record>
 
+        <!-- Mail subtypes -->
+        <record id="mail.mt_issue_new" model="mail.message.subtype">
+            <field name="name">created</field>
+            <field name="res_model">project.issue</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mt_issue_new" model="mail.message.subtype">
+            <field name="name">stage change</field>
+            <field name="res_model">project.issue</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mt_issue_closed" model="mail.message.subtype">
+            <field name="name">closed</field>
+            <field name="res_model">project.issue</field>
+        </record>
+
     </data>
 </openerp>