diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index a7490a93b..f83f4336e 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -76,7 +76,8 @@ Webmail.prototype = {
             });
 
             $("#rightcol").css({
-                marginLeft: 200 + 48 + 'px'
+                marginLeft: 200 + 'px',
+                paddingRight: 90 + 'px'
             });
         }
 
@@ -89,6 +90,11 @@ Webmail.prototype = {
                     width: 35 + '%'
                 });
             }
+            if ($( window ).width()>767){
+                $("tr td[name='from']").css({
+                    width: 20 + '%'
+                });
+            }
 
             if ($( window ).width()<1198){
                 $("#leftcol").addClass(
@@ -122,7 +128,8 @@ Webmail.prototype = {
                 });
 
                 $("#rightcol").css({
-                    marginLeft: 200 + 48 + 'px'
+                    marginLeft: 200 + 'px',
+                    paddingRight: 90 + 'px'
                 });
             }
         });
@@ -145,17 +152,17 @@ Webmail.prototype = {
                 if ($( window ).width()>1198){
                     var width = ui.size.width;
                     $("#rightcol").css({
-                        marginLeft: width + 48 + 'px'
+                        marginLeft: width + 'px'
                     });
                     $("#folders").css({
                         width : width + 'px'
                     });
                     $("#rightcol").css({
-                        paddingRight: width - 250 + 'px'
+                        paddingRight: width - 110 + 'px'
                     });
                     if ($( window ).width()<1800){
                         $("#rightcol").css({
-                            paddingRight: width - 180 + 'px'
+                            paddingRight: width - 110 + 'px'
                         });
                     }
                 }
diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html
index f9ff16091..8a295df8c 100644
--- a/modoboa/extensions/webmail/templates/webmail/index.html
+++ b/modoboa/extensions/webmail/templates/webmail/index.html
@@ -32,10 +32,10 @@ $(document).ready(function() {
 
 {% block fixed_content %}
 <div class="row">
-    <div id="leftcol" class="col-lg-2 col-md-3 col-ms-3 col-xs-0">
+    <div id="leftcol" class="col-lg-1 col-md-3 col-ms-3 col-xs-0">
       <div id="folders" class="well">{{ mboxes }}</div>
     </div>
-    <div id="rightcol" class="col-lg-10 col-md-12 col-ms-12 col-xs-12">
+    <div id="rightcol" class="col-lg-11 col-md-12 col-ms-12 col-xs-12">
         <div id="menubar" class="col-lg-12 col-md-12 col-ms-12 col-xs-12"></div>
         <div id="listing" class=""></div>
     </div>