1 files changed, 19 insertions, 7 deletions

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 3500b9fe4..2e5267425 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -1,6 +1,6 @@
 /*
  * Archive plugin script
- * @version 2.0
+ * @version 2.1
  */
 
 function rcmail_archive(prop)
@@ -8,29 +8,41 @@ function rcmail_archive(prop)
   if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
     return;
 
-  if (rcmail.env.mailbox.indexOf(rcmail.env.archive_folder) != 0) {
+  if (rcmail_is_archive()) {
     if (!rcmail.env.archive_type) {
       // simply move to archive folder (if no partition type is set)
       rcmail.command('move', rcmail.env.archive_folder);
     }
     else {
       // let the server sort the messages to the according subfolders
-      var post_data = { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
-      rcmail.http_post('plugin.move2archive', post_data);
+      rcmail.http_post('plugin.move2archive', rcmail.selection_post_data());
     }
   }
 }
 
+function rcmail_is_archive()
+{
+  if (!rcmail.env.archive_folder)
+    return false;
+
+  // check if current folder is an archive folder or one of its children
+  if (rcmail.env.mailbox == rcmail.env.archive_folder
+    || rcmail.env.mailbox.startsWith(rcmail.env.archive_folder + rcmail.env.delimiter)
+  ) {
+    return true;
+  }
+}
+
 // callback for app-onload event
 if (window.rcmail) {
   rcmail.addEventListener('init', function(evt) {
     // register command (directly enable in message view mode)
-    rcmail.register_command('plugin.archive', rcmail_archive, (rcmail.env.uid && rcmail.env.mailbox != rcmail.env.archive_folder));
+    rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && rcmail_is_archive());
 
     // add event-listener to message list
     if (rcmail.message_list)
       rcmail.message_list.addEventListener('select', function(list) {
-        rcmail.enable_command('plugin.archive', (list.get_selection().length > 0 && rcmail.env.mailbox != rcmail.env.archive_folder));
+        rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && rcmail_is_archive());
       });
 
     // set css style for archive folder
@@ -41,7 +53,7 @@ if (window.rcmail) {
     // callback for server response
     rcmail.addEventListener('plugin.move2archive_response', function(result) {
       if (result.update)
-        rcmail.command('checkmail');  // refresh list
+        rcmail.command('list');  // refresh list
     });
   })
 }