diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index ed7a7fae..ee6e497a 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -667,7 +667,7 @@ rcube_webmail.prototype.files_list_update = function(head)
   var list = this.file_list;
 
   list.clear();
-  $('thead', list.list).html(head);
+  $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
   kolab_files_list_coltypes();
   file_api.file_list();
 };
@@ -1019,6 +1019,7 @@ function kolab_files_ui()
     });
 
     this.env.file_list = list;
+    rcmail.file_list.resize();
   };
 
   // call file_list request for every folder (used for search and virt. collections)
@@ -1068,6 +1069,8 @@ function kolab_files_ui()
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
     }
 
+    rcmail.file_list.resize();
+
     if (!valid)
       return;
 
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 88217946..aca658cf 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -157,59 +157,59 @@
   color: #aaa;
 }
 
-#filelist thead tr td {
+.filelist thead tr td {
   padding: 0;
 }
 
-#filelist tbody tr td {
+.filelist tbody tr td {
   padding: 2px 7px;
   height: 18px;
 }
 
-#filelist tr td.size {
+.filelist tr td.size {
   width: 80px;
   text-align: right;
 }
 
-#filelist thead tr td.size {
+.filelist thead tr td.size {
   text-align: left;
 }
 
-#filelist tr td.mtime {
+.filelist tr td.mtime {
   width: 125px;
 }
 
-#filelist tr td.options {
+.filelist tr td.options {
   width: 26px;
   cursor: pointer;
 }
 
-#filelist thead tr td.filename,
-#filelist tbody tr td.filename {
+.filelist thead tr td.filename,
+.filelist tbody tr td.filename {
   width: 99%;
   white-space: nowrap;
 }
 
-#filelist thead tr td.sortedASC a,
-#filelist thead tr td.sortedDESC a {
+.filelist thead tr td.sortedASC a,
+.filelist thead tr td.sortedDESC a {
   color: #004458;
   text-decoration: underline;
   background: url(../../../../skins/larry/images/listicons.png) right -912px no-repeat;
 }
 
-#filelist thead tr td.sortedASC a {
+.filelist thead tr td.sortedASC a {
   background-position: right -944px;
 }
 
-#filelist td img {
+.filelist td img {
   vertical-align: middle;
   display: inline-block;
 }
 
-#filelist tr td.options div.listmenu,
-#filelist tr td.flag span.flagged,
-#filelist tr td.flag span.unflagged,
-#filelist tr td.flag span.unflagged:hover {
+.filelist tr td.options div.listmenu,
+.filelist tr td.flag span.flagged,
+.filelist tr td.flag span.unflagged,
+.filelist tr td.flag span.unflagged:hover {
   display: inline-block;
   vertical-align: middle;
   height: 18px;
@@ -218,35 +218,43 @@
   background: url(../../../../skins/larry/images/listicons.png) -100px 0 no-repeat;
 }
 
-#filelist thead tr td.options div.listmenu {
+.filelist thead tr td.options div.listmenu {
   background-position: 0 -976px;
   cursor: pointer;
   width: 26px;
 }
 
-#filelist thead tr td.options {
+.filelist thead tr td.options {
   padding: 0 3px;
 }
 
-#filelist tbody tr td.options:hover span {
+.filelist thead tr td.options {
+  padding: 2px 3px;
+}
+
+.filelist thead tr td:first-child {
+  border-radius: 4px 0 0 0;
+}
+
+.filelist tbody tr td.options:hover span {
   width: 26px;
   height: 18px;
   background: url(../../../../skins/larry/images/buttons.png) -5px -418px no-repeat;
   display: block;
 }
 
-#filelist td.filename {
+.filelist td.filename {
   padding: 0 4px;
 }
 
-#filelist tbody td.filename span {
+.filelist tbody td.filename span {
   background: url(images/unknown.png) 0 0 no-repeat;
   padding: 0 0 0 20px;
   height: 16px;
 }
 
 /*
-#filelist tbody td.filename span input {
+.filelist tbody td.filename span input {
   padding: 0 2px;
   height: 18px;
 }
diff --git a/plugins/kolab_files/skins/larry/templates/compose_plugin.html b/plugins/kolab_files/skins/larry/templates/compose_plugin.html
index 7ab87779..2c458692 100644
--- a/plugins/kolab_files/skins/larry/templates/compose_plugin.html
+++ b/plugins/kolab_files/skins/larry/templates/compose_plugin.html
@@ -10,7 +10,7 @@
     </div>
 
     <div id="filelistcontainer" class="boxlistcontent uibox">
-        <roundcube:object name="filelist" id="filelist" class="records-table sortheader" />
+        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" />
     </div>
 </div>
 
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index cc4e7093..dd0bc16b 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -39,7 +39,7 @@
 
 <div id="filelistcontainer" class="uibox">
     <div id="filelistbox" class="boxlistcontent">
-        <roundcube:object name="filelist" id="filelist" class="records-table sortheader" optionsmenuIcon="true" />
+        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" />
     </div>
     <roundcube:object name="message" id="message" class="statusbar" />
 </div>