diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 67b2efc84a0..fd70bedd77c 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -96,8 +96,8 @@
             <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <search string="Search groups">
-                    <field name="name"/>
+                <search string="Search Groups">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1f7ec2297de..9f0977faa25 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -52,9 +52,9 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
-                    <field name="model"/>
+                    <field name="model" filter_domain="[('model','ilike',self)]" string="Message"/>
                     <field name="date"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -164,6 +164,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <field name="email_from" filter_domain="['|', '|' '|' ('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self), ('model','ilike',self)]" string="Email"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <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')]"/>
@@ -173,16 +176,10 @@
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="email_from"/>
-                    <field name="email_to"/>
-                    <field name="subject"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
                         <field name="partner_id" string="Partner Name"/>
-                        <field name="model"/>
                         <field name="res_id"/>
                     </group>
                     <newline/>