From b68c141e1d245aa3ad6390c7f55d5c6b0f39c492 Mon Sep 17 00:00:00 2001
From: johndoh <roundcube@tehinterweb.co.uk>
Date: Thu, 21 Nov 2019 07:21:12 +0000
Subject: [PATCH] Always update folder count after purge command (#7051)

... not only when it is the current folder.
---
 program/steps/mail/folders.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index 54fd894b7..88935e861 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -59,6 +59,13 @@ else if ($RCMAIL->action == 'purge') {
 
         if ($success) {
             $OUTPUT->show_message('folderpurged', 'confirmation');
+            $OUTPUT->command('set_unread_count', $mbox, 0);
+            rcmail_set_unseen_count($mbox, 0);
+
+            // set trash folder state
+            if ($mbox === $trash_mbox) {
+                $OUTPUT->command('set_trash_count', 0);
+            }
 
             if (!empty($_REQUEST['_reload'])) {
                 $OUTPUT->set_env('messagecount', 0);
@@ -66,14 +73,7 @@ else if ($RCMAIL->action == 'purge') {
                 $OUTPUT->set_env('exists', 0);
                 $OUTPUT->command('message_list.clear');
                 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox);
-                $OUTPUT->command('set_unread_count', $mbox, 0);
                 $OUTPUT->command('set_quota', $RCMAIL->quota_content(null, $mbox));
-                rcmail_set_unseen_count($mbox, 0);
-
-                // set trash folder state
-                if ($mbox === $trash_mbox) {
-                    $OUTPUT->command('set_trash_count', 0);
-                }
             }
         }
         else {