Fix refreshing of drafts list when sending a message which was saved in meantime (#1490238)

1 files changed, 5 insertions, 0 deletions

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 76a8188c3..715ee32cf 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -684,11 +684,16 @@ if ($savedraft) {
     $OUTPUT->command('auto_save_start');
 }
 else {
+    // Collect folders which could contain the composed message,
+    // we'll refresh the list if currently opened folder is one of them (#1490238)
     $folders = array();
 
     if (in_array($COMPOSE['mode'], array('reply', 'forward', 'draft'))) {
         $folders[] = $COMPOSE['mailbox'];
     }
+    if (!empty($COMPOSE['param']['draft_uid']) && $drafts_mbox) {
+        $folders[] = $drafts_mbox;
+    }
 
     rcmail_compose_cleanup($COMPOSE_ID);
     $OUTPUT->command('remove_compose_data', $COMPOSE_ID);