From 46f7b7096450939fe03c95aa81ce06ae4bfca89d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Mar 2016 06:51:43 -0400
Subject: [PATCH] Enable reply/reply-all/forward buttons also in preview frame of message/rfc822

---
 program/steps/mail/copy.inc |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index 5668f7c..68fa246 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  +-----------------------------------------------------------------------+
  | program/steps/mail/copy.inc                                           |
  |                                                                       |
@@ -24,15 +24,19 @@
     return;
 }
 
-// move messages
+// copy messages
 if (!empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
-    $target = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
+    $target  = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
+    $sources = array();
 
-    foreach (rcmail::get_uids() as $mbox => $uids) {
-        if ($mbox == $target)
+    foreach (rcmail::get_uids(null, null, $multifolder) as $mbox => $uids) {
+        if ($mbox === $target) {
             $copied++;
-        else
+        }
+        else {
             $copied += (int)$RCMAIL->storage->copy_message($uids, $target, $mbox);
+            $sources[] = $mbox;
+        }
     }
 
     if (!$copied) {
@@ -47,7 +51,7 @@
 
     rcmail_send_unread_count($target, true);
 
-    $OUTPUT->command('set_quota', $RCMAIL->quota_content());
+    $OUTPUT->command('set_quota', $RCMAIL->quota_content(null, $multifolder ? $sources[0] : 'INBOX'));
 }
 // unknown action or missing query param
 else {

--
Gitblit v1.9.1