diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 37dca4ceddb..73337d92ab0 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -175,7 +175,7 @@ class email_template(osv.osv):
                  'res_model': 'mail.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d}" % (template.id),
+                 'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d, 'default_use_template': True}" % (template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e9df69a27e4..1f6aa1976c6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -25,6 +25,7 @@ openerp.mail = function(session) {
                 */
                 for(var key in action.context){
                     if( key!='default_template_id' &&
+                        key!='default_composition_mode' &&
                         key!='default_use_template' &&
                         key!='default_is_private' &&
                         key!='default_model' &&
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 7d75c67b942..877a4bf6111 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -81,11 +81,7 @@ class mail_compose_message(osv.TransientModel):
         elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
         elif composition_mode == 'mass_mail' and model and active_ids:
-            if context.get('default_template_id'):
-                vals =  self.pool.get('email.template').generate_email(cr, uid, context.get('default_template_id'), res_id, context=context)
-                vals.update({'content_subtype': 'html'})
-            else:
-                vals = {'model': model, 'res_id': res_id,  'content_subtype': 'html'}
+            vals = {'model': model, 'res_id': res_id,  'content_subtype': 'html'}
         else:
             vals = {'model': model, 'res_id': res_id}
         if composition_mode: