diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2501ce50ad3..34e2cb9bb14 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -95,9 +95,9 @@
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
-                            <separator string="Temp Need Action" colspan="4"/>
-                            <field name="need_action"/>
+                            <separator string="Temporary Need Action" colspan="4"/>
                             <field name="need_action_user_id"/>
+                            <newline/>
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </page>
                     </notebook>
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index d74ee2cb644..2474c321946 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import base_needaction
 import mail_message
 import mail_thread
 import mail_group
diff --git a/addons/mail/base_needaction.py b/addons/mail/base_needaction.py
deleted file mode 100644
index bebbd2555d3..00000000000
--- a/addons/mail/base_needaction.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009-Today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-import time
-import tools
-import logging
-from osv import osv, fields
-from tools.translate import _
-
-class mail_needaction(osv.osv):
-    '''TODO
-    '''
-    _name = 'mail.needaction'
-    _description = 'Need action Engine'
-    
-    def get_needaction_user_id(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
-        result = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = False
-        return result
-    
-    #def set_needaction_user_id(self, cr, uid, id, name, value, arg, context=None):
-        #"""
-        #@param name: Name of field
-        #@param value: Value of field
-        #@param arg: User defined argument
-        #"""
-        #if context is None:
-            #context = {}
-        #return self.write(cr, uid, [id], {name: value}, context=context)
-
-    def get_needaction_user_id_wrapper(self, cr, uid, ids, name, arg, context=None):
-        return self.get_needaction_user_id(cr, uid, ids, name, arg, context=context)
-    
-    def set_needaction_user_id_wrapper(self, cr, uid, id, name, value, arg, context=None):
-        return self.set_needaction_user_id(cr, uid, id, name, value, arg, context=context)
-
-    _columns = {
-        'need_action': fields.boolean('Need action'),
-        'need_action_user_id': fields.function(get_needaction_user_id_wrapper,
-                        #fnct_inv=set_needaction_user_id_wrapper,
-                        type='many2one', relation='res.users', store=True, string='User'),
-                        
-    }
-    
-    _defaults = {
-        'need_action': False,
-    }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/base_needaction_view.xml b/addons/mail/base_needaction_view.xml
deleted file mode 100644
index cc8d30d080d..00000000000
--- a/addons/mail/base_needaction_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    </data>
-</openerp>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2b162c47900..09fafd48a7e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -53,7 +53,7 @@ class mail_thread(osv.osv):
     '''
     _name = 'mail.thread'
     _description = 'Email Thread'
-    _inherit = ['mail.needaction']
+    _inherit = ['res.needaction']
     
     def _get_message_ids(self, cr, uid, ids, name, arg, context=None):
         res = {}