diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 86f136ca5b9..fea309dcf72 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -78,6 +78,11 @@ class email_template(osv.osv):
             logging.exception("failed to render mako template value %r", template)
             return u""
 
+    def _prepare_render_template_context(self, cr, uid, model, res_id, context=None):
+        if context is None:
+            return {}
+        return context.copy()
+
     def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
         if context is None:
             context = {}
@@ -317,12 +322,13 @@ class email_template(osv.osv):
 
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
+        template_context = self._prepare_render_template_context(cr, uid, template.model, res_id, context)
 
         for field in ['subject', 'body_text', 'body_html', 'email_from',
                       'email_to', 'email_cc', 'email_bcc', 'reply_to',
                       'message_id']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
-                                                 template.model, res_id, context=context) \
+                                                 template.model, res_id, context=template_context) \
                                                  or False
 
         if values['body_html']:
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index f37df754c7e..ccebb8565ec 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -204,4 +204,7 @@ class mail_compose_message(osv.osv_memory):
     def render_template(self, cr, uid, template, model, res_id, context=None):
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
 
+    def _prepare_render_template_context(self, cr, uid, model, res_id, context=None):
+        return self.pool.get('email.template')._prepare_render_template_context(cr, uid, model, res_id, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: