From e8cb51669a325a3d5b60fcc37b99d494809bf837 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 07 Apr 2014 10:24:37 -0400
Subject: [PATCH] More fixes for multi-folder search (#1485234)

---
 program/steps/mail/sendmail.inc |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 2cd897e..4fcc2b5 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -534,10 +534,16 @@
     }
 
     // set replied/forwarded flag
-    if ($COMPOSE['reply_uid'])
-        $RCMAIL->storage->set_flag($COMPOSE['reply_uid'], 'ANSWERED', $COMPOSE['mailbox']);
-    else if ($COMPOSE['forward_uid'])
-        $RCMAIL->storage->set_flag($COMPOSE['forward_uid'], 'FORWARDED', $COMPOSE['mailbox']);
+    if ($COMPOSE['reply_uid']) {
+        foreach (rcmail_get_uids($COMPOSE['reply_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
+            $RCMAIL->storage->set_flag($uids, 'ANSWERED', $mbox);
+        }
+    }
+    else if ($COMPOSE['forward_uid']) {
+        foreach (rcmail_get_uids($COMPOSE['forward_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
+            $RCMAIL->storage->set_flag($uids, 'FORWARDED', $mbox);
+        }
+    }
 }
 
 // Determine which folder to save message

--
Gitblit v1.9.1