Allways return current folder from quota_content()

1 files changed, 2 insertions, 5 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index b105eb892..ed5fedb4a 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1684,7 +1684,8 @@ class rcmail extends rcube
         $quota = $this->plugins->exec_hook('quota', $quota);
 
         $quota_result = (array) $quota;
-        $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+        $quota_result['type']   = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+        $quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX';
 
         if ($quota['total'] > 0) {
             if (!isset($quota['percent'])) {
@@ -1748,10 +1749,6 @@ class rcmail extends rcube
             unset($quota_result['all']);
         }
 
-        if ($folder !== null && $folder !== '') {
-            $quota_result['folder'] = $folder;
-        }
-
         return $quota_result;
     }