diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 78dfa4bb46a..90b686d6693 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -311,7 +311,7 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.parse_message(cr, msg_txt, save_original=save_original, context=context)
+        msg = self.parse_message(cr, uid, msg_txt, save_original=save_original, context=context)
         msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
@@ -385,7 +385,7 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def parse_message(self, cr, message, save_original=False, context=None):
+    def parse_message(self, cr, uid, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
            message details.
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index d493501e1cc..6d6262ddd22 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -44,7 +44,7 @@ class plugin_handler(osv.osv_memory):
         res_id = 0
         url = ""
         name = ""
-        msg = mail_message_obj.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
@@ -91,7 +91,7 @@ class plugin_handler(osv.osv_memory):
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        msg = mail_message.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         message_id = msg.get('message-id')
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         
@@ -146,7 +146,7 @@ class plugin_handler(osv.osv_memory):
         mail_message = self.pool.get('mail.message')        
         ir_attachment_obj = self.pool.get('ir.attachment')
         attach_ids = []
-        msg = mail_message.parse_message(headers)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, headers)
         message_id = msg.get('message-id')    
         push_mail = self.push_message(cr, uid, model, headers, res_id)
         res_id = push_mail[1]