diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5d5d599be0e..7e38a2b8a85 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -218,6 +218,7 @@ class mail_message(osv.osv):
                         ('exception', 'Delivery Failed'),
                         ('cancel', 'Cancelled'),
                         ], 'State', readonly=True),
+        'message_state': fields.selection([('read', 'Read'),('unread', 'Unread')], 'Message State'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
         'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1),
     }
@@ -225,6 +226,7 @@ class mail_message(osv.osv):
     _defaults = {
         'type': 'email',
         'state': 'received',
+        'message_state': 'unread'
     }
     
     #------------------------------------------------------
@@ -582,7 +584,7 @@ class mail_message(osv.osv):
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res})
+                    message.write({'state':'sent', 'message_id': res, 'message_state': 'read'})
                 else:
                     message.write({'state':'exception'})
                 message.refresh()
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index ecd106e05e5..8c6eacf4994 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -112,6 +112,7 @@
                             </notebook>
                             <separator string="" colspan="4"/>
                             <group col="6" colspan="6">
+                                <field name="message_state"/>
                                 <field name="state" colspan="2"/>
                                 <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
                                 <group colspan="2">
@@ -167,9 +168,10 @@
             <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-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="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')]"/>
                     <separator orientation="vertical"/>
@@ -216,7 +218,7 @@
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
+            <field name="context">{'search_default_type_email': 1}</field>
             <field name="search_view_id" ref="view_email_message_search"/>
         </record>