diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 15f6618c8e5..0c7aca1a30d 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <footer>
-                    <field name="message_ids" widget="mail_thread" 
+                        <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </footer>
                 </xpath>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 7cbbb123bcb..5135fd31e35 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -73,10 +73,10 @@ class res_users(osv.osv):
             The purpose is to add messages directly sent to user using
             @user_login.
         """
-        initial_domain = super(res_partner, self).message_search_get_domain(cr, uid, ids, context=context)
+        initial_domain = super(res_users, self).message_search_get_domain(cr, uid, ids, context=context)
         custom_domain = []
         for user in self.browse(cr, uid, ids, context=context):
             if custom_domain:
                 custom_domain += ['|']
             custom_domain += ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
-        return ['|'] + search_domain + custom_domain
+        return ['|'] + initial_domain + custom_domain
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 918f77e0ace..7e439bb3de8 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,9 +27,9 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_bottom">
+                    <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </div>
+                    </footer>
                 </xpath>
             </data>
             </field>