Index: program/js/app.js
===================================================================
--- program/js/app.js	(revision 69f17cfda10febf0e4b8401b2f1cf371b8f49568)
+++ program/js/app.js	(revision 41841bc0985959bc938200f3f3f119985be4daa6)
@@ -2638,9 +2638,15 @@
   this.delete_folder = function(folder)
     {
-  if (this.edit_folder)
-    this.reset_folder_rename();
+    if (this.edit_folder)
+      this.reset_folder_rename();
     
     if (folder)
+      {
       this.http_post('delete-folder', '_mboxes='+urlencode(folder));
+      var folders = new Array(folder);
+      for (var row in this.env.subscriptionrows)
+        if (this.env.subscriptionrows[row][0].match(new RegExp('^'+RegExp.escape(folder+this.env.delimiter))))
+          this.http_post('delete-folder', '_mboxes='+urlencode(this.env.subscriptionrows[row][0]));
+      }
     };