diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index fd00135816e..1693397f6fa 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import ast
 import base64
 import dateutil.parser
 import email
@@ -32,7 +33,6 @@ import tools
 from osv import osv
 from osv import fields
 from tools.translate import _
-from tools.safe_eval import literal_eval
 
 _logger = logging.getLogger('mail')
 
@@ -508,7 +508,7 @@ class mail_message(osv.osv):
                     object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
                     subtype=message.subtype,
                     subtype_alternative=subtype_alternative,
-                    headers=message.headers and literal_eval(message.headers))
+                    headers=message.headers and ast.literal_eval(message.headers))
                 res = ir_mail_server.send_email(cr, uid, msg,
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 2c554c5f0c7..de4bcee4f76 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
+import ast
 import re
 
 import tools
 from osv import osv
 from osv import fields
 from tools.safe_eval import safe_eval as eval
-from tools.safe_eval import literal_eval
 from tools.translate import _
 
 from ..mail_message import to_email
@@ -213,7 +213,7 @@ class mail_compose_message(osv.osv_memory):
                 else:
                     active_model = mail.model
                     active_model_pool = self.pool.get(active_model)
-                    active_ids = active_model_pool.search(cr, uid, literal_eval(mail.filter_id.domain), context=literal_eval(mail.filter_id.context))
+                    active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail.filter_id.domain), context=ast.literal_eval(mail.filter_id.context))
 
                 for active_id in active_ids:
                     subject = self.render_template(cr, uid, mail.subject, active_model, active_id)