diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3cd45fd5cd1..5fc8891edb4 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
+        <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead', 'search_default_inbox': 1}</field>
         <field name="help">
             &lt;img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223"&gt;
             &lt;h2&gt;Create your first OpenERP Lead &lt;/h2&gt;
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 95577080c20..30c4fef7bf5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -324,6 +324,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 36f81d49844..1536b47432d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -156,7 +156,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         if stage_ids:
             return self.write(cr, uid, [applicant_id], {'stage_id': stage_ids[0]}, context=context)
         else:
-            return cr.execute("""UPDATE hr_applicant SET state=%s WHERE id=%s""", (field_value, hr_applicant_id))
+            return cr.execute("""UPDATE hr_applicant SET state=%s WHERE id=%s""", (field_value, applicant_id))
     
 
     _columns = {
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 04d73dcd2a8..a30d2ee7ac7 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field>            
+            <field name="context">{'search_default_filter_inprogress':1, 'search_default_filter_new':1, "search_default_department_id": department_id, 'search_default_inbox': 1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 76b73e9aca3..08f20cd3722 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -179,6 +179,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
+               <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                <filter icon="terp-document-new" string="New" name="filter_new" 
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 02814db35d7..677d790ae90 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -218,7 +218,6 @@ 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),
     }
@@ -226,7 +225,6 @@ class mail_message(osv.osv):
     _defaults = {
         'type': 'email',
         'state': 'received',
-        'message_state': 'unread'
     }
     
     #------------------------------------------------------
@@ -524,8 +522,8 @@ class mail_message(osv.osv):
         """
         if context is None:
             context = {}
-        if context.get('active_ids', False):
-            self.write(cr, uid, context['active_ids'], {'message_state':'read'}, context=context)
+        if context.get('active_ids', False) and context.get('active_model', False):
+            self.pool.get(context['active_model']).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 \
@@ -588,7 +586,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_state': 'read'})
+                    message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
                 message.refresh()
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index fb42e71b2a3..b9fce2cfe7d 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -112,7 +112,6 @@
                             </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">
@@ -168,7 +167,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
-                    <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"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8cd8ef415c3..0d133c334a9 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -72,6 +72,7 @@ class mail_thread(osv.osv):
     _columns = {
         'message_ids_social': fields.function(_get_message_ids, method=True,
                         type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
+        'message_state': fields.selection([('read', 'Read'),('unread', 'Unread')], 'Message State'),
     }
 
     #------------------------------------------------------
@@ -569,6 +570,7 @@ class mail_thread(osv.osv):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
         self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
+        self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg_dict, vals={}, default_act=None, context=None):
@@ -587,6 +589,7 @@ class mail_thread(osv.osv):
                                 to determine the model of the thread to
                                 update (instead of the current model).
         """
+        self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
         return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
 
     def message_thread_followers(self, cr, uid, ids, context=None):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f86caeadef0..e13df09ee8f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -299,7 +299,7 @@
                             <separator string="Miscelleanous" colspan="4"/>
                             <field name="partner_id" />
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            <group col="4" colspan="2">
+                            <group col="4" colspan="2" attrs="{'invisible': ['|', ('project_id','=', False), ('type_id','=', False)]}">
                                 <field name="type_id" widget="selection" readonly="1"/>
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
@@ -429,11 +429,11 @@
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="type_id" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
-                        states="draft,open,pending"
+                        states="open,pending"
                         string="Change Stage"
                         type="object"
                         icon="gtk-go-forward"
-                        help="Change Type"/>
+                        help="Change Type" attrs="{'invisible': [('type_id','=', False)]}"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -489,6 +489,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -529,7 +530,7 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_project_id": project_id, 'search_default_inbox': 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 90697d4bb80..c84a097a24b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -443,6 +443,7 @@ class project_issue(crm.crm_case, osv.osv):
             vals.update(custom_values)
 
         res_id = self.create(cr, uid, vals, context)
+        self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
         self.message_append_dict(cr, uid, [res_id], msg, context=context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
@@ -481,6 +482,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
+        self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
         self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
 
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index dd61992a555..79dedafc261 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,7 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id, 'search_default_inbox': 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f01442f7ecf..8860641d886 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -62,7 +62,7 @@
                         </group>
                         <field name="user_id"/>
                         <field name="version_id" colspan="2" widget="selection"/>
-                        <group colspan="2" col="4">
+                        <group colspan="2" col="4" attrs="{'invisible': [('type_id','=', False)]}">
                             <field name="type_id" string="Stages" />
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
@@ -132,8 +132,8 @@
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
                     <field name="type_id" widget="selection" readonly="1" string="Stages" />
-                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
+                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage" attrs="{'invisible': [('type_id','=', False)]}"/>
+                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage" attrs="{'invisible': [('type_id','=', False)]}"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
@@ -157,6 +157,7 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
+                        <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                         <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
                         <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>