4 files changed, 31 insertions, 19 deletions
diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index a0fb15c8a..5bb6c61d7 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -19,7 +19,7 @@
   position: absolute;
   top: 60px;
   left: 490px;
-  width: 200px;
+  width: 240px;
   height: 20px;
   text-align: left;
 }
diff --git a/skins/default/images/icons/edit.png b/skins/default/images/icons/edit.png
new file mode 100644
index 000000000..9b40b5c7b
--- /dev/null
+++ b/skins/default/images/icons/edit.png
diff --git a/skins/default/settings.css b/skins/default/settings.css
index fe6a5898b..c172576fd 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -67,6 +67,15 @@ span.tablink-selected a
   left: 20px;
 }
 
+#folder-manager
+{
+  width: 500px;
+  bottom: 120px;
+  overflow: auto;
+  border: 1px solid #999999;
+  height: expression((parseInt(document.documentElement.clientHeight)-215)+'px');
+}
+
 #identities-table
 {
   width: 500px;
@@ -101,6 +110,15 @@ span.tablink-selected a
   padding-right: 10px;
 }
 
+#bottomboxes
+{
+  position: absolute;
+  width: 500px;
+  height: 100px;
+  left: 20px;
+  bottom: 20px;
+}
+
 #userprefs-title,
 #identity-title,
 div.boxtitle,
@@ -132,8 +150,8 @@ div.settingspart
 
 #subscription-table
 {
-  width: 500px;
-  border: 1px solid #999999;
+  width: 100%;
+  table-layout: fixed;
 }
 
 #subscription-table tbody td
@@ -145,10 +163,12 @@ div.settingspart
   background-color: #F9F9F9;
 }
 
-/*
-#subscription-table tbody td select
+#subscription-table td.name
 {
-  width: 150px;
+  width: 280px;
 }
-*/
 
+#subscription-table td.subscribed
+{
+  width: 80px;
+}
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index a94d73848..d37861916 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,9 +16,11 @@
 <div id="folder-manager">
 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
   cellpadding="1" cellspacing="0" summary="Folder subscription table"
-  deleteIcon="/images/icons/folder-trash.png" />
-
+  deleteIcon="/images/icons/folder-trash.png"
+  renameIcon="/images/icons/edit.png" />
+</div>
 
+<div id="bottomboxes">
 <div class="settingsbox">
 <div class="boxtitle"><roundcube:label name="createfolder" /></div>
 
@@ -29,16 +31,6 @@
 </div>
 </div>
 
-<div class="settingsbox">
-<div class="boxtitle"><roundcube:label name="renamefolder" /></div>
-
-<div class="settingspart">
-<roundcube:label name="foldername" />:&nbsp;
-<roundcube:object name="renamefolder" form="subscriptionform" />
-<roundcube:button command="rename-folder" type="input" class="button" label="rename" />
-</div>
-</div>
-
 </div>
 
 </form>