diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e589d8b56cb..26d85aa68e9 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -134,6 +134,7 @@ class mail_message(osv.Model):
         'subtype_id': fields.many2one('mail.message.subtype', 'Subtype'),
         'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes',
             help='Users that voted for this message'),
+        'is_private': fields.boolean('Private message'),
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
@@ -150,6 +151,7 @@ class mail_message(osv.Model):
         'date': lambda *a: fields.datetime.now(),
         'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
         'body': '',
+        'is_private': False,
     }
 
     #------------------------------------------------------
@@ -221,7 +223,7 @@ class mail_message(osv.Model):
             'unread': msg.unread and msg.unread['unread'] or False
         }
 
-    def message_read_expandable(self, cr, uid, tree, result, message_loaded, domain, context, parent_id, limit):
+    def _message_read_expandable(self, cr, uid, tree, result, message_loaded, domain, context, parent_id, limit):
         """
         create the expandable message for all parent message read
         this function is used by message_read
@@ -337,7 +339,7 @@ class mail_message(osv.Model):
 
         result = sorted(result, key=lambda k: k['id'])
 
-        result = self.message_read_expandable(cr, uid, tree, result, message_loaded, domain, context, parent_id, limit)
+        result = self._message_read_expandable(cr, uid, tree, result, message_loaded, domain, context, parent_id, limit)
 
         return result
 
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index cc0419352af..173b18d0ed8 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -87,21 +87,28 @@
         <record id="action_mail_inbox_feeds" model="ir.actions.client">
             <field name="name">Inbox</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+            <field name="params" eval="&quot;{'domain': [('is_private','=',True),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'default_is_private':True} }&quot;"/>
+        </record>
+
+        <record id="action_mail_wall_feeds" model="ir.actions.client">
+            <field name="name">Wall</field>
+            <field name="tag">mail.wall</field>
+            <field name="params" eval="&quot;{'domain': [('is_private','=',False),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'default_is_private':False} }&quot;"/>
         </record>
 
         <record id="action_mail_archives_feeds" model="ir.actions.client">
             <field name="name">Archives</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', False)],
+            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', False)]
                 'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
 
         <record id="action_mail_sent_feeds" model="ir.actions.client">
             <field name="name">Sent</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
+            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])]
                 'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
     </data>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 3507e7c449f..f607238276b 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -18,15 +18,21 @@
           <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
+        <record id="mail_inboxfeeds" model="ir.ui.menu">
+          <field name="name">Wall</field>
+          <field name="sequence" eval="11"/>
+          <field name="action" ref="action_mail_wall_feeds"/>
+          <field name="parent_id" ref="mail_feeds"/>
+        </record>
         <record id="mail_archivesfeeds" model="ir.ui.menu">
           <field name="name">Archives</field>
-          <field name="sequence" eval="11"/>
+          <field name="sequence" eval="12"/>
           <field name="action" ref="action_mail_archives_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_sentfeeds" model="ir.ui.menu">
           <field name="name">Sent</field>
-          <field name="sequence" eval="12"/>
+          <field name="sequence" eval="13"/>
           <field name="action" ref="action_mail_sent_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 462e4e2ecb8..aa8b2c8a2b1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1095,6 +1095,7 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var searchview_ready = this.load_searchview({}, false);
             var thread_displayed = this.message_render();
+            this.options.domain = this.options.domain.concat(this.search_results['domain']);
             return (searchview_ready && thread_displayed);
         },
 
@@ -1134,18 +1135,14 @@ openerp.mail = function(session) {
 
         /** Clean and display the threads */
         message_render: function (search) {
-            var domain = this.options.domain.concat(this.search_results['domain']);
-
-            var context = _.extend(this.options.context, search&&search.context ? search.context : {});
-
             this.thread = new mail.Thread(this, {
-                    'domain' : domain,
-                    'context' : context,
+                    'domain' : this.options.domain.concat(this.search_results['domain']),
+                    'context' : _.extend(this.options.context, search&&search.search_results['context'] ? search.search_results['context'] : {}),
                     'options': {
                         'thread' :{
                             'thread_level': this.options.thread_level,
                             'use_composer': true,
-                            'show_header_compose': 1, 
+                            'show_header_compose': 1,
                         },
                         'message': {
                             'show_reply': this.options.thread_level > 0,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e04a72ae664..1e2e6a970b6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -111,8 +111,7 @@
                 <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
                 <li t-if="!widget.options.thread.display_on_flat and widget.unread" title="Read"><a class="oe_read oe_e">W</a></li>
                 <li t-if="!widget.options.thread.display_on_flat and !widget.unread" title="Set back to unread"><a class="oe_unread oe_e">h</a></li>
-                <li t-if="!widget.options.message.show_reply_by_email" title="Reply"><a class="oe_reply oe_e">)</a></li>
-                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_e" title="Reply by mail">)</a></li>
+                <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
                 <t t-if="(widget.options.message.show_reply || widget.options.message.show_reply_by_email || (widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email')">
                     <li>
                         <span class="oe_dropdown_toggle">
@@ -124,7 +123,7 @@
                                     <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a>
                                 </li> -->
                                 <li t-if="widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_full_reply">Full reply</a></li>
-                                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_full_reply" title="Reply by mail">Full reply</a></li>
+                                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_full_reply" title="Reply by mail">Full reply by mail</a></li>
                                 <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{widget.id}" >Details</a></li>
                             </ul>
                         </span>