diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7e38a2b8a85..02814db35d7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -522,6 +522,10 @@ class mail_message(osv.osv):
         :param browse_record message: the message that was just sent
         :return: True
         """
+        if context is None:
+            context = {}
+        if context.get('active_ids', False):
+            self.write(cr, uid, context['active_ids'], {'message_state':'read'}, context=context)
         if message.auto_delete:
             self.pool.get('ir.attachment').unlink(cr, uid,
                                                   [x.id for x in message.attachment_ids \
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8c6eacf4994..bfe1a2b8bd6 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -168,9 +168,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
-                    <!--filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
-                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/-->
                     <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>