diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d8337c75f13..69fd2147e92 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -688,14 +688,6 @@
     height: 47px;
 }
 
-.openerp .oe_mail_wall > div {
-    position: absolute;
-    overflow: auto;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
 /* ----------- INBOX INTEGRATION ----------- */
 
 .openerp .oe_mail_wall .oe_mail{
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 863950b567b..62ecdcd89d6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -191,10 +191,14 @@
             </tr>
           </tbody>
         </table>
-        <div>
-            <div class="oe_searchview_drawer_container"/>
-            <div class="oe_mail-placeholder"></div>
-            <aside class="oe_mail_wall_aside"></aside>
+        <div class="oe_view_manager_wrapper">
+            <div>
+                <div class="oe_view_manager_body">
+                    <div class="oe_searchview_drawer_container"/>
+                    <div class="oe_mail-placeholder"></div>
+                    <aside class="oe_mail_wall_aside"></aside>
+                </div>
+            </div>
         </div>
     </div>