Improve screen min-width calculation

2 files changed, 6 insertions, 7 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index d653c7804..0af34f371 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -388,7 +388,6 @@ a.iconbutton.threadmode.selected {
 	position: absolute;
 	right: 0;
 	top: 0;
-	width: 400px;
 }
 
 #mailpreviewtoggle {
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index ccc9cef67..a8572720b 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -204,12 +204,6 @@ function rcube_mail_ui()
       }
     }
 
-    // set min-width to show all toolbar buttons
-    var screen = $('.minwidth');
-    if (screen.length) {
-      screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').parent().width() + 20);
-    }
-
     // turn a group of fieldsets into tabs
     $('.tabbed').each(function(idx, elem){ init_tabs(elem); })
 
@@ -247,6 +241,12 @@ function rcube_mail_ui()
         });
     });
 
+    // set min-width to show all toolbar buttons
+    var screen = $('body > div.minwidth');
+    if (screen.length) {
+      screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').width() + $('#searchfilter').width() + 30);
+    }
+
     $(document.body)
       .bind('mouseup', body_mouseup)
       .bind('keyup', function(e){