diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 90eda625759..fe4155cb236 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -186,7 +186,7 @@ class email_template(osv.osv):
                  'res_model': 'mail.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'mail.compose.message.mode':'mass_mail'}",
+                 'context': "{'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' : %d}" % (template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index beb59ba1eea..ef4572429a1 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -69,6 +69,10 @@ class mail_compose_message(osv.osv_memory):
                                         size=-1 # means we want an int db column
                                         ),
     }
+    
+    _defaults = {
+        'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False)          
+    }
 
     def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None):
         if context is None: