Fix archive button on messages page when using archive_type != '' (#1489404)

1 files changed, 8 insertions, 1 deletions

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 3500b9fe4..cf44b74d4 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -15,7 +15,14 @@ function rcmail_archive(prop)
     }
     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 };
+      var post_data = { _uid: rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
+
+      if (rcmail.env.display_next && rcmail.env.next_uid)
+        post_data._next_uid = rcmail.env.next_uid;
+
+      if (rcmail.env.action)
+        post_data._from = rcmail.env.action;
+
       rcmail.http_post('plugin.move2archive', post_data);
     }
   }