7 files changed, 18 insertions, 5 deletions
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index f17f393c2..2bf1538c4 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -644,13 +644,14 @@ folder_search_init: function(container)
   $('.boxtitle a.search', container).click(function(e) {
     var title = $('.boxtitle', container),
       box = $('.listsearchbox', container),
-      dir = box.is(':visible') ? -1 : 1;
+      dir = box.is(':visible') ? -1 : 1,
+      height = 24 + ($('select', box).length ? 24 : 0);
 
     box.slideToggle({
       duration: 160,
       progress: function(animation, progress) {
         if (dir < 0) progress = 1 - progress;
-          $('.boxlistcontent', container).css('top', (title.outerHeight() + 24 * progress) + 'px');
+          $('.boxlistcontent', container).css('top', (title.outerHeight() + height * progress) + 'px');
       },
       complete: function() {
         box.toggleClass('expanded');
diff --git a/skins/classic/settings.css b/skins/classic/settings.css
index cd250d57e..9dda7bb8d 100644
--- a/skins/classic/settings.css
+++ b/skins/classic/settings.css
@@ -21,6 +21,11 @@
   text-indent: 50000px;
 }
 
+.listsearchbox select {
+  width: 100%;
+  margin: 1px 0;
+}
+
 #identities-table,
 #sections-table
 {
diff --git a/skins/classic/templates/folders.html b/skins/classic/templates/folders.html
index 8ed0b5fdc..ac824306f 100644
--- a/skins/classic/templates/folders.html
+++ b/skins/classic/templates/folders.html
@@ -29,6 +29,7 @@
         <a class="iconbutton searchicon"></a>
         <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" width="13" height="13" />
     </div>
+    <roundcube:object name="folderfilter" id="folderlist-filter" />
 </div>
 <div id="folderlist-content" class="boxlistcontent">
     <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index cda47b631..b2779982c 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -224,6 +224,11 @@
 	top: 34px;
 }
 
+.listsearchbox select {
+	width: 100%;
+	margin: 3px 0;
+}
+
 #folderslist,
 #identitieslist {
 	position: absolute;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index d7fd588a8..b2b4f9a05 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1957,7 +1957,6 @@ ul.proplist li {
 }
 
 .listsearchbox {
-	position: relative;
 	padding: 4px;
 	background: #c7e3ef;
 	display: none;
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index 3d016cad1..977dff451 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -29,6 +29,7 @@
 		<a class="iconbutton searchicon"></a>
 		<roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
+	<roundcube:object name="folderfilter" id="folderlist-filter" />
 </div>
 <div id="folderslist-content" class="scroller withfooter">
 	<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" class="treelist listing folderlist" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 1eb8e899a..7b08aeadd 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -540,13 +540,14 @@ function rcube_mail_ui()
     $('.boxtitle a.search', container).click(function(e) {
       var title = $('.boxtitle', container),
         box = $('.listsearchbox', container),
-        dir = box.is(':visible') ? -1 : 1;
+        dir = box.is(':visible') ? -1 : 1,
+        height = 34 + ($('select', box).length ? 24 : 0);
 
       box.slideToggle({
         duration: 160,
         progress: function(animation, progress) {
           if (dir < 0) progress = 1 - progress;
-            $('.scroller', container).css('top', (title.outerHeight() + 34 * progress) + 'px');
+            $('.scroller', container).css('top', (title.outerHeight() + height * progress) + 'px');
         },
         complete: function() {
           box.toggleClass('expanded');