diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index f0328bfa779..964552b951a 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
             <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
-            <field name="name">Outgoing emails robot</field>
+            <field name="name">Email Queue Manager</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9ac983e269d..07d0aabe7cd 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -171,7 +171,7 @@ class mail_message(osv.osv):
                         ('outgoing', 'Outgoing'),
                         ('sent', 'Sent'),
                         ('received', 'Received'),
-                        ('exception', 'Exception'),
+                        ('exception', 'Delivery Failed'),
                         ('cancel', 'Cancelled'),
                         ], 'State', readonly=True),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it"),
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0447590c134..c3ceb0740fa 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -102,7 +102,7 @@
                 <search string="Email Search">
                     <filter icon="terp-camera_test" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-gtk-stop" string="Exception" domain="[('state','=','exception')]"/>
+                    <filter icon="terp-gtk-stop" string="Failed" domain="[('state','=','exception')]"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
                     <field name="subject"/>