diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index e58c2d1c818..534c4b7bb64 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -156,7 +156,7 @@
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-stop" string="Failed" domain="[('state','=','exception')]"/>
+                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
                     <field name="subject"/>
@@ -194,7 +194,8 @@
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('type', '=', 'email'), '|',('state','in',['outgoing','exception']),('email_from', '!=', False)]</field>
+            <field name="domain">[('type', '=', 'email')]</field>
+            <field name="context">{'search_default_received': 1, 'search_default_exception': 1}</field>
             <field name="search_view_id" ref="view_email_message_search"/>
         </record>
 
@@ -205,10 +206,11 @@
             src_model="res.partner"
             view_id="view_email_message_tree"/>
 
-        <menuitem name="Messages"
-            id="menu_email_message"
-            parent="base.menu_email"
-            action="action_view_mail_message" />
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Emails" id="menu_email_message" parent="base.menu_email" action="action_view_mail_message" />
+        
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="All messages" id="menu_email_notifications" parent="base.menu_email" action="action_view_all_messages_short" />
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">All Feeds</field>
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 4fde0938ad4..fa71981eda2 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -52,5 +52,11 @@
             <field name="view_mode">tree,form</field>
         </record>
 
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Subscriptions" id="menu_email_subscriptions" parent="base.menu_email" action="action_view_subscriptions" sequence="30" />
+        
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Pushed notifications" id="menu_email_notifications" parent="base.menu_email" action="action_view_notifications" sequence="31" />
+
     </data>
 </openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index def47fc73da..e0bdd9dbef9 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -22,11 +22,6 @@
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-        <!-- left-side menu: Tmp !-->
-        <menuitem id="mail_debug" name="Debug/Tmp" sequence="20" parent="mail_feeds_main"/>
-        <menuitem id="mail_debug_msgs" name="Messages" parent="mail_debug" action="action_view_all_messages_short"/>
-        <menuitem id="mail_debug_subs" name="Subscriptions" parent="mail_debug" action="action_view_subscriptions"/>
-        <menuitem id="mail_debug_notifs" name="Pushed notif" parent="mail_debug" action="action_view_notifications"/>
     
     </data>
 </openerp>