diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index eeca792b970..0406efd4526 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -155,12 +155,12 @@
         <record id="mt_invoice_validated" model="mail.message.subtype">
             <field name="name">Validated</field>
             <field name="res_model">account.invoice</field>
-            <field name="description">Invoice &lt;b&gt;validated&lt;/b&gt;</field>
+            <field name="description">Invoice validated</field>
         </record>
         <record id="mt_invoice_paid" model="mail.message.subtype">
             <field name="name">Paid</field>
             <field name="res_model">account.invoice</field>
-            <field name="description">Invoice &lt;b&gt;paid&lt;/b&gt;</field>
+            <field name="description">Invoice paid</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 96ce219bbb6..da677972b8b 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -159,63 +159,64 @@
             <field name="name">Lead Created</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
-            <field name="description">Opportunity &lt;b&gt;created&lt;/b&gt;</field>
+            <field name="description">Opportunity created</field>
         </record>
         <record id="mt_lead_convert_to_opportunity" model="mail.message.subtype">
             <field name="name">Lead to Opportunity</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
+            <field name="description">Lead converted into an opportunity</field>
         </record>
         <record id="mt_lead_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">crm.lead</field>
-            <field name="description">Stage &lt;b&gt;changed&lt;/b&gt;</field>
+            <field name="description">Stage changed</field>
+        </record>
+        <record id="mt_lead_won" model="mail.message.subtype">
+            <field name="name">Opportunity Won</field>
+            <field name="res_model">crm.lead</field>
+            <field name="description">Opportunity won</field>
         </record>
         <record id="mt_lead_lost" model="mail.message.subtype">
             <field name="name">Opportunity Lost</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
-            <field name="description">Opportunity &lt;b&gt;lost&lt;/b&gt;</field>
-        </record>
-        <record id="mt_lead_won" model="mail.message.subtype">
-            <field name="name">Opportunity Won</field>
-            <field name="res_model">crm.lead</field>
-            <field name="description">Opportunity &lt;b&gt;won&lt;/b&gt;</field>
+            <field name="description">Opportunity lost</field>
         </record>
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_lead" model="mail.message.subtype">
-            <field name="name">ST-Lead Created</field>
+            <field name="name">Lead Created</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_create')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_opportunity" model="mail.message.subtype">
-            <field name="name">ST-Lead to Opportunity</field>
+            <field name="name">Lead to Opportunity</field>
             <field name="default" eval="False"/>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_convert_to_opportunity')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
-            <field name="name">ST-Stage Changed</field>
+            <field name="name">Opportunity Stage Changed</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_stage')"/>
             <field name="relation_field">section_id</field>
         </record>
+        <record id="mt_salesteam_lead_won" model="mail.message.subtype">
+            <field name="name">Opportunity Won</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="parent_id" eval="ref('mt_lead_won')"/>
+            <field name="relation_field">section_id</field>
+        </record>
         <record id="mt_salesteam_lead_lost" model="mail.message.subtype">
-            <field name="name">ST-Opportunity Lost</field>
+            <field name="name">Opportunity Lost</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_lost')"/>
             <field name="relation_field">section_id</field>
         </record>
-        <record id="mt_salesteam_lead_won" model="mail.message.subtype">
-            <field name="name">ST-Opportunity Won</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('mt_lead_won')"/>
-            <field name="relation_field">section_id</field>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 056000199b8..365423427c5 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -49,18 +49,18 @@
         <record id="mt_holidays_confirmed" model="mail.message.subtype">
             <field name="name">To Approve</field>
             <field name="res_model">hr.holidays</field>
-            <field name="description">Request &lt;b&gt;confirmed&lt;/b&gt;, waiting confirmation</field>
+            <field name="description">Request confirmed, waiting confirmation</field>
         </record>
         <record id="mt_holidays_approved" model="mail.message.subtype">
             <field name="name">Approved</field>
             <field name="res_model">hr.holidays</field>
-            <field name="description">Request &lt;b&gt;approved&lt;/b&gt;</field>
+            <field name="description">Request approved</field>
         </record>
         <record id="mt_holidays_refused" model="mail.message.subtype">
             <field name="name">Refused</field>
             <field name="res_model">hr.holidays</field>
             <field name="default" eval="False"/>
-            <field name="description">Request &lt;b&gt;refused&lt;/b&gt;</field>
+            <field name="description">Request refused</field>
         </record>
 
     </data>
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 0d46af13b35..13736d1442a 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -470,18 +470,18 @@
     <record id="mt_stage_changed" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
         <field name="res_model">hr.applicant</field>
-        <field name="description">Stage &lt;b&gt;changed&lt;/b&gt;</field>
+        <field name="description">Stage changed</field>
     </record>
     <record id="mt_applicant_hired" model="mail.message.subtype">
         <field name="name">Applicant Hired</field>
         <field name="res_model">hr.applicant</field>
-        <field name="description">Applicant &lt;b&gt;hired&lt;/b&gt;</field>
+        <field name="description">Applicant hired</field>
     </record>
     <record id="mt_applicant_refused" model="mail.message.subtype">
         <field name="name">Applicant Refused</field>
         <field name="res_model">hr.applicant</field>
         <field name="default" eval="False"/>
-        <field name="description">Applicant &lt;b&gt;refused&lt;/b&gt;</field>
+        <field name="description">Applicant refused</field>
     </record>
 
 </data>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 67c1420b5aa..92082d59b5e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -247,7 +247,7 @@ class mail_thread(osv.AbstractModel):
 
         # automatic logging unless asked not to (mainly for various testing purpose)
         if not context.get('mail_create_nolog'):
-            self.message_post(cr, uid, thread_id, body='Document <b>created</b>.', context=context)
+            self.message_post(cr, uid, thread_id, body='Document created', context=context)
         return thread_id
 
     def write(self, cr, uid, ids, values, context=None):
@@ -342,12 +342,12 @@ class mail_thread(osv.AbstractModel):
             for col_name, col_info in tracked_fields.items():
                 if record[col_name] == initial[col_name] and getattr(self._all_columns[col_name].column, 'track_visibility', 0) == 2:
                     tracked_values[col_name] = dict(col_info=col_info['string'],
-                        new_value=convert_for_display(record[col_name], col_info))
+                                                        new_value=convert_for_display(record[col_name], col_info))
                 elif record[col_name] != initial[col_name]:
                     if getattr(self._all_columns[col_name].column, 'track_visibility', 0) in [1, 2]:
                         tracked_values[col_name] = dict(col_info=col_info['string'],
-                            old_value=convert_for_display(initial[col_name], col_info),
-                            new_value=convert_for_display(record[col_name], col_info))
+                                                            old_value=convert_for_display(initial[col_name], col_info),
+                                                            new_value=convert_for_display(record[col_name], col_info))
                     if col_name in tracked_fields:
                         changes.append(col_name)
             if not changes:
@@ -369,7 +369,7 @@ class mail_thread(osv.AbstractModel):
                 except ValueError, e:
                     _logger.debug('subtype %s not found, giving error "%s"' % (subtype, e))
                     continue
-                message = format_message(subtype_rec.description, tracked_values)
+                message = format_message(subtype_rec.description if subtype_rec.description else subtype_rec.name, tracked_values)
                 self.message_post(cr, uid, record['id'], body=message, subtype=subtype, context=context)
                 posted = True
             if not posted:
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 58aa11bc398..56a21342d9e 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -83,58 +83,58 @@
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
-            <field name="description">Task &lt;b&gt;created&lt;/b&gt;</field>
+            <field name="description">Task created</field>
         </record>
         <record id="mt_task_started" model="mail.message.subtype">
             <field name="name">Task Started</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
-            <field name="description">Task &lt;b&gt;started&lt;/b&gt;</field>
+            <field name="description">Task started</field>
         </record>
         <record id="mt_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
             <field name="res_model">project.task</field>
-            <field name="description">Task &lt;b&gt;blocked&lt;/b&gt;</field>
+            <field name="description">Task blocked</field>
         </record>
         <record id="mt_task_closed" model="mail.message.subtype">
             <field name="name">Task Done</field>
             <field name="res_model">project.task</field>
-            <field name="description">Task &lt;b&gt;closed&lt;/b&gt;</field>
+            <field name="description">Task closed</field>
         </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.task</field>
-            <field name="description">Stage &lt;b&gt;changed&lt;/b&gt;</field>
+            <field name="description">Stage changed</field>
         </record>
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_task_new" model="mail.message.subtype">
-            <field name="name">PT-Task Created</field>
+            <field name="name">Task Created</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_new')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_started" model="mail.message.subtype">
-            <field name="name">PT-Task Started</field>
+            <field name="name">Task Started</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_started')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
-            <field name="name">PT-Task Blocked</field>
+            <field name="name">Task Blocked</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_closed" model="mail.message.subtype">
-            <field name="name">PT-Task Done</field>
+            <field name="name">Task Done</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_closed')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
-            <field name="name">PT-Stage Changed</field>
+            <field name="name">Task Stage Changed</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_stage')"/>
             <field name="relation_field">project_id</field>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a7ffc79002d..e65055491a2 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -52,11 +52,12 @@ class project_issue(base_stage, osv.osv):
 
     _track = {
         'state': {
+            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
             'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'done',
             'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
         },
         'stage_id': {
-            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'open'],
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
         },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 5b11d1ca510..55ec90b430d 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -48,60 +48,60 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="name">Issue Created</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
-            <field name="description">Issue &lt;b&gt;created&lt;/b&gt;</field>
+            <field name="description">Issue created</field>
         </record>
         <record id="mt_issue_started" model="mail.message.subtype">
             <field name="name">Issue Started</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
-            <field name="description">Issue &lt;b&gt;started&lt;/b&gt;</field>
+            <field name="description">Issue started</field>
         </record>
         <record id="mt_issue_blocked" model="mail.message.subtype">
             <field name="name">Issue Blocked</field>
             <field name="res_model">project.issue</field>
-            <field name="description">Issue &lt;b&gt;blocked&lt;/b&gt;</field>
+            <field name="description">Issue blocked</field>
         </record>
         <record id="mt_issue_closed" model="mail.message.subtype">
             <field name="name">Issue Closed</field>
             <field name="res_model">project.issue</field>
-            <field name="description">Issue &lt;b&gt;closed&lt;/b&gt;</field>
+            <field name="description">Issue closed</field>
         </record>
         <record id="mt_issue_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.issue</field>
-            <field name="description">Stage &lt;b&gt;changed&lt;/b&gt;</field>
+            <field name="description">Stage changed</field>
         </record>
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_issue_new" model="mail.message.subtype">
-            <field name="name">PJ-Issue Created</field>
+            <field name="name">Issue Created</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_new')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_started" model="mail.message.subtype">
-            <field name="name">PJ-Issue Started</field>
+            <field name="name">Issue Started</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_started')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_blocked" model="mail.message.subtype">
-            <field name="name">PJ-Issue Blocked</field>
+            <field name="name">Issue Blocked</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_issue_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_closed" model="mail.message.subtype">
-            <field name="name">PJ-Issue Closed</field>
+            <field name="name">Issue Closed</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_issue_closed')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_stage" model="mail.message.subtype">
-            <field name="name">PJ-Stage Changed</field>
+            <field name="name">Issue Stage Changed</field>
             <field name="res_model">project.project</field>
-            <field name="description">Stage &lt;b&gt;changed&lt;/b&gt;</field>
+            <field name="description">Stage changed</field>
             <field name="parent_id" eval="ref('mt_issue_stage')"/>
             <field name="relation_field">project_id</field>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4bf96924bd2..616e1642bf0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -52,7 +52,7 @@ class sale_order(osv.osv):
     _track = {
         'state': {
             'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['manual', 'progress'],
-            'sale.mt_quotation_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent']
+            'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent']
         },
     }
 
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4a08063ea81..3176c1e7212 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -45,15 +45,15 @@
         </record>
         
         <!-- Sale-related subtypes for messaging / Chatter -->
-        <record id="mt_quotation_sent" model="mail.message.subtype">
-            <field name="name">Quotation sent</field>
+        <record id="mt_order_sent" model="mail.message.subtype">
+            <field name="name">Quotation send</field>
             <field name="res_model">sale.order</field>
-            <field name="description">Quotation &lt;b&gt;send&lt;/b&gt;</field>
+            <field name="description">Quotation send</field>
         </record>
         <record id="mt_order_confirmed" model="mail.message.subtype">
             <field name="name">Sale Order Confirmed</field>
             <field name="res_model">sale.order</field>
-            <field name="description">Quotation &lt;b&gt;confirmed&lt;/b&gt;</field>
+            <field name="description">Quotation confirmed</field>
         </record>
 
     </data>
diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml
index ab52e71a076..7a8f3d9c691 100644
--- a/addons/sale_crm/sale_crm_data.xml
+++ b/addons/sale_crm/sale_crm_data.xml
@@ -3,13 +3,13 @@
     <data noupdate="1">
 
         <!-- Salesteam-related subtypes for messaging / Chatter -->
-        <record id="mt_salesteam_sent" model="mail.message.subtype">
-            <field name="name">Quotation sent</field>
+        <record id="mt_salesteam_order_sent" model="mail.message.subtype">
+            <field name="name">Quotation Send</field>
             <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('sale.mt_quotation_sent')"/>
+            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
             <field name="relation_field">section_id</field>
         </record>
-        <record id="mt_salesteam_confirmed" model="mail.message.subtype">
+        <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
             <field name="name">Sale Order Confirmed</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>