diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 4912c1e276c..cccf3a2574b 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -382,6 +382,7 @@ class MassMailing(osv.Model):
             'ir.attachment', 'mass_mailing_ir_attachments_rel',
             'mass_mailing_id', 'attachment_id', 'Attachments'
         ),
+        'keep_archives': fields.boolean('Keep Archives'),
         'mass_mailing_campaign_id': fields.many2one(
             'mail.mass_mailing.campaign', 'Mass Mailing Campaign',
             ondelete='set null',
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 3a4938b9daa..5a7fca3a2aa 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -365,6 +365,7 @@
                                         on_change="on_change_model_and_list(mailing_model, contact_list_ids)"/>
                                 </div>
                             </div>
+                            <field name="keep_archives"/>
                         </group>
                         <notebook>
                             <page string="Mail Body">
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 5f9bcc2deac..de3f6e62cbd 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -58,6 +58,6 @@ class MailComposeMessage(osv.TransientModel):
                     })],
                     # email-mode: keep original message for routing
                     'notification': mass_mailing.reply_to_mode == 'thread',
-                    'auto_delete': True,
+                    'auto_delete': not mass_mailing.keep_archives,
                 })
         return res