diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index cb068d566c1..e14a8f3dfe5 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -267,10 +267,7 @@ class mail_compose_message(osv.TransientModel):
             # mass mailing: rendering override wizard static values
             if mass_mail_mode and wizard.model:
                 # always keep a copy, reset record name (avoid browsing records)
-                mail_values.update(notification=True, record_name=False)
-                if hasattr(self.pool[wizard.model], 'message_new'):
-                    mail_values['model'] = wizard.model
-                    mail_values['res_id'] = res_id
+                mail_values.update(notification=True, model=wizard.model, res_id=res_id, record_name=False)
                 # auto deletion of mail_mail
                 if 'mail_auto_delete' in context:
                     mail_values['auto_delete'] = context.get('mail_auto_delete')
diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index a67f88a2a28..0e44399a256 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -84,7 +84,8 @@ class MailMail(osv.Model):
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
         res = super(MailMail, self).send_get_email_dict(cr, uid, mail, partner, context=context)
         if mail.mailing_id and res.get('body') and res.get('email_to'):
-            email_to = tools.email_split(res.get('email_to')[0])
+            emails = tools.email_split(res.get('email_to')[0])
+            email_to = emails and emails[0] or False
             unsubscribe_url = self._get_unsubscribe_url(cr, uid, mail, email_to, context=context)
             if unsubscribe_url:
                 res['body'] = tools.append_content_to_html(res['body'], unsubscribe_url, plaintext=False, container_tag='p')
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index c7b6eb6f9de..8771a10f04f 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -591,6 +591,7 @@
                     <field name="mail_mail_id"/>
                     <field name="message_id"/>
                     <field name="sent"/>
+                    <field name="exception"/>
                     <field name="opened"/>
                     <field name="replied"/>
                     <field name="bounced"/>