diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7afb9595e31..601ec1a1692 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -52,7 +52,7 @@ class mail_message(osv.Model):
     _order = 'id desc'
     _rec_name = 'record_name'
 
-    _message_read_limit = 100
+    _message_read_limit = 30
     _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read', 'email_from',
         'type', 'vote_user_ids', 'attachment_ids', 'author_id', 'partner_ids', 'record_name', 'favorite_user_ids']
     _message_record_name_length = 18
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 7f722d6a586..1f4c75e6bb4 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,7 +8,7 @@
               'default_model': 'res.users', 
               'default_res_id': uid
             }</field>
-            <field name="params">{
+            <field name="params" eval="&quot;{
                 'domain': [
                   ('notification_ids.partner_id.user_ids', 'in', [uid]),
                   ('to_read', '=', True),
@@ -17,7 +17,7 @@
                 'view_mailbox': True,
                 'view_inbox': True,
                 'read_action': 'read'
-            }</field>
+            }&quot;"/>
             <field name="help">
                 There are no message in your mailbox for this search.
             </field>
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9900e8049f2..cdd83bd4c7d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -147,7 +147,7 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row" t-if="widget.context.view_mailbox" >
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message