diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index f69fd2af7e6..80c53b398bb 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -22,6 +22,7 @@
 from osv import osv
 from osv import fields
 import tools
+from tools.safe_eval import safe_eval as eval
 
 class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
@@ -220,7 +221,11 @@ class email_compose_message(osv.osv_memory):
 
 
     def get_template_value(self, cr, uid, message, model, resource_id, context=None):
-        return message
+        locals_for_emails = {
+            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+            'object' : self.pool.get(model).browse(cr, uid, resource_id),
+        }
+        return message and eval(message, {}, locals_for_emails)
 
 email_compose_message()