diff --git a/program/js/app.js b/program/js/app.js
index 3e1129bf1..b2fccb717 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2637,11 +2637,17 @@ function rcube_webmail()
   // delete a specific mailbox with all its messages
   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]));
+      }
     };