- save selected folder when go to compose (to back to proper folder)

program/js/app.js

@@ -821,11 +821,16 @@ function rcube_webmail()
       case 'compose':
         var url = this.env.comm_path+'&_action=compose';
        
-        if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox)
+        if (this.task=='mail')
+          {
+    	  url += '&_mbox='+urlencode(this.env.mailbox);
+          
+	  if (this.env.mailbox==this.env.drafts_mailbox)
 	    {
 	    var uid;
             if (uid = this.get_single_uid())
-            url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+              url += '&_draft_uid='+uid;
+            }
 	  }
         // modify url if we're in addressbook
         else if (this.task=='addressbook')