2 files changed, 27 insertions, 1 deletions
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index bd3291b9f..0bafc3e08 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -35,9 +35,12 @@
 <div id="mailleftcontainer">
 <div id="mailboxlist-container">
 <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
-<div id="directorylistwarp" style="bottom:0px">
+<div class="boxlistcontent">
 <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
 </div>
+<div class="boxfooter">
+  <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " />
+</div>
 </div>
 </div>
 
@@ -65,5 +68,14 @@
     rcmail.add_onload('mailviewsplitv.init()');
 </script>
 
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
 </body>
 </html>
diff --git a/skins/default/templates/messageerror.html b/skins/default/templates/messageerror.html
index 0bd591a2a..3712217a3 100644
--- a/skins/default/templates/messageerror.html
+++ b/skins/default/templates/messageerror.html
@@ -41,8 +41,13 @@
 <div id="mailleftcontainer">
 <div id="mailboxlist-container">
 <div class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div class="boxlistcontent">
 <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
 </div>
+<div class="boxfooter">
+  <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " />
+</div>
+</div>
 </div>
 
 <div id="messageframe" style="background-color:#F2F2F2;">
@@ -58,6 +63,15 @@
     rcmail.add_onload('mailviewsplitv.init()');
 </script>
 
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
 </body>
 <roundcube:endif />