diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ed4735a55e8..d9d4c6e6c9d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -580,7 +580,7 @@ class crm_case(osv.osv):
 
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
-        model_obj = self.pool.get('ir.model')
+        model_obj = self.pool.get('ir.model')        
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model','=',case._name)])            
             data = {
@@ -820,14 +820,7 @@ class crm_case_history(osv.osv):
     _name = "crm.case.history"
     _description = "Case history"
     _order = "id desc"
-    _inherits = {'crm.case.log':"log_id"}
-
-    def create(self, cr, user, vals, context=None):
-        if vals.has_key('res_id') and vals['res_id']:
-            case_obj = self.pool.get(vals['model_id'])
-            cases = case_obj.browse(cr, user, [vals['res_id']])
-            case_obj._action(cr, user, cases, '')
-        return super(crm_case_history, self).create(cr, user, vals, context)
+    _inherits = {'crm.case.log':"log_id"}    
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
         res = {}
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 2da93ee3347..e66e2784f2a 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -49,9 +49,9 @@ class crm_cases(osv.osv):
         res = mailgate_obj.partner_get(cr, uid, msg['From'])
         if res:
             data.update(res)
-        res = self.create(cr, uid, data)
+        res = self.create(cr, uid, data)        
         cases = self.browse(cr, uid, [res])       
-        self.__history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
+        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
         return res
     
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):         
@@ -80,7 +80,7 @@ class crm_cases(osv.osv):
 
         res = self.write(cr, uid, ids, data)
         cases = self.browse(cr, uid, [res])       
-        self.__history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])        
+        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])        
         getattr(self,act)(cr, uid, ids)
         return res