diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index a09620868e5..b1a1d217b8c 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -64,6 +64,14 @@ class hr_expense_expense(osv.osv):
     _inherit = ['mail.thread']
     _description = "Expense"
     _order = "id desc"
+    _track = {
+        'state': {
+            'hr_expense.mt_expense_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'accepted',
+            'hr_expense.mt_expense_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancelled',
+            'hr_expense.mt_expense_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
+        },
+    }
+
     _columns = {
         'name': fields.char('Description', size=128, required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'id': fields.integer('Sheet ID', readonly=True),
@@ -89,7 +97,8 @@ class hr_expense_expense(osv.osv):
             ('accepted', 'Approved'),
             ('done', 'Done'),
             ],
-            'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
+            'Status', readonly=True, track_visibility=1,
+            help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
     }
     _defaults = {
@@ -124,33 +133,17 @@ class hr_expense_expense(osv.osv):
             company_id = employee.company_id.id
         return {'value': {'department_id': department_id, 'company_id': company_id}}
 
-    def expense_confirm(self, cr, uid, ids, *args):
+    def expense_confirm(self, cr, uid, ids, context=None):
         for expense in self.browse(cr, uid, ids):
             if expense.employee_id and expense.employee_id.parent_id.user_id:
                 self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
-        self.message_post(cr, uid, ids, body=_("The request is <b>waiting for Approval</b>"),
-                          subtype="hr_expense.mt_expense_approve")
-        self.write(cr, uid, ids, {
-            'state':'confirm',
-            'date_confirm': time.strftime('%Y-%m-%d')
-        })
-        return True
+        return self.write(cr, uid, ids, {'state': 'confirm', 'date_confirm': time.strftime('%Y-%m-%d')}, context=context)
 
-    def expense_accept(self, cr, uid, ids, *args):
-        self.message_post(cr, uid, ids, body=_("The request has been <b>approved</b>"),
-                          subtype="hr_expense.mt_expense_approved")
-        self.write(cr, uid, ids, {
-            'state':'accepted',
-            'date_valid':time.strftime('%Y-%m-%d'),
-            'user_valid': uid,
-            })
-        return True
+    def expense_accept(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'accepted', 'date_valid': time.strftime('%Y-%m-%d'), 'user_valid': uid}, context=context)
 
-    def expense_canceled(self, cr, uid, ids, *args):
-        self.message_post(cr, uid, ids, body=_("Request <b>refused</b>"), 
-                          subtype="hr_expense.mt_expense_refused")
-        self.write(cr, uid, ids, {'state':'cancelled'})
-        return True
+    def expense_canceled(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
     def action_receipt_create(self, cr, uid, ids, context=None):
         property_obj = self.pool.get('ir.property')
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index c5f1b99bb11..6808470801d 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -18,23 +18,21 @@
             <field name="name">Expenses</field>
         </record>
 
-        <!--subtype for expense -->
-        <record id="mt_expense_approve" model="mail.message.subtype">
-            <field name="name">To Approve</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="default" eval="False"/>
-        </record>
-
         <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="mt_expense_approved" model="mail.message.subtype">
             <field name="name">Approved</field>
             <field name="res_model">hr.expense.expense</field>
-            <field name="default" eval="False"/>
+            <field name="description">Expense &lt;b&gt;approved&lt;/b&gt;</field>
         </record>
         <record id="mt_expense_refused" model="mail.message.subtype">
             <field name="name">Refused</field>
             <field name="res_model">hr.expense.expense</field>
-            <field name="default" eval="False"/>
+            <field name="description">Expense &lt;b&gt;refused&lt;/b&gt;</field>
+        </record>
+        <record id="mt_expense_confirmed" model="mail.message.subtype">
+            <field name="name">To Approve</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="description">Expense &lt;b&gt;confirmed&lt;/b&gt;, waiting confirmation</field>
         </record>
 
     </data>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4176d19f18a..35240c40423 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -375,7 +375,7 @@ class hr_holidays(osv.osv):
         for record in self.browse(cr, uid, ids, context=context):
             if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
                 self.message_subscribe_users(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
-        return self.write(cr, uid, ids, {'state':'confirm'})
+        return self.write(cr, uid, ids, {'state': 'confirm'})
 
     def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')