After message is sent refresh messages list of replied message folder (#1489249)

2 files changed, 17 insertions, 6 deletions

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 4a0e52b2b..e9f638cb1 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -165,6 +165,8 @@ else if ($msg_uid = $COMPOSE['param']['forward_uid']) {
 else if ($msg_uid = $COMPOSE['param']['uid']) {
   $compose_mode = RCUBE_COMPOSE_EDIT;
 }
+
+$COMPOSE['mode'] = $compose_mode;
 $OUTPUT->set_env('compose_mode', $compose_mode);
 
 $config_show_sig = $RCMAIL->config->get('show_sig', 1);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 1a92844c0..779fb87cd 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -823,15 +823,24 @@ if ($savedraft) {
 
   // start the auto-save timer again
   $OUTPUT->command('auto_save_start');
-
-  $OUTPUT->send('iframe');
 }
 else {
+  $folders = array();
+
+  if ($COMPOSE['mode'] == 'reply' || $COMPOSE['mode'] == 'forward')
+    $folders[] = $COMPOSE['mailbox'];
+
   rcmail_compose_cleanup($COMPOSE_ID);
 
   if ($store_folder && !$saved)
-    $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
-  else
-    $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'), $store_target);
-  $OUTPUT->send('iframe');
+    $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'), $folders);
+  else {
+    if ($store_folder) {
+      $folders[] = $store_target;
+    }
+
+    $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'), $folders);
+  }
 }
+
+$OUTPUT->send('iframe');