diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index e5276eb7fd5..4b3f0d6b9bd 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -43,15 +43,18 @@ class MailComposeMessage(osv.TransientModel):
         email mass mailing. """
         res = super(MailComposeMessage, self).get_mail_values(cr, uid, wizard, res_ids, context=context)
         if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_campaign_id:  # TODO: which kind of mass mailing ?
-            current_date = fields.datetime.now()
-            mass_mailing_id = self.pool['mail.mass_mailing'].create(
-                cr, uid, {
-                    'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
-                    'name': '%s-%s' % (wizard.mass_mailing_campaign_id.name, current_date),
-                    'date': current_date,
-                    'domain': wizard.active_domain,
-                    'template_id': wizard.template_id and wizard.template_id.id or False,
-                }, context=context)
+            if wizard.mass_mailing_id:
+                mass_mailing_id = wizard.mass_mailing_id.id
+            else:
+                current_date = fields.datetime.now()
+                mass_mailing_id = self.pool['mail.mass_mailing'].create(
+                    cr, uid, {
+                        'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
+                        'name': '%s-%s' % (wizard.mass_mailing_campaign_id.name, current_date),
+                        'date': current_date,
+                        'domain': wizard.active_domain,
+                        'template_id': wizard.template_id and wizard.template_id.id or False,
+                    }, context=context)
             for res_id in res_ids:
                 res[res_id]['statistics_ids'] = [(0, 0, {
                     'model': wizard.model,