Check/create default folders on every login not only the first (#1489423)

2 files changed, 10 insertions, 9 deletions

diff --git a/CHANGELOG b/CHANGELOG
index cc8838d74..e99c673ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Check/create default folders on every login not only the first (#1489423)
 - Update to jQuery-1.11.0 and jQuery-UI-1.9.2
 - Support SMTP socket context options via new config option 'smtp_conn_options'
 - Fix compatibility with PHP 5.2 in html.php file (#1489514)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a927b7946..bb42cab46 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -634,14 +634,6 @@ class rcmail extends rcube
             $this->set_user($user);
             $this->set_storage_prop();
 
-            // fix some old settings according to namespace prefix
-            $this->fix_namespace_settings($user);
-
-            // create default folders on first login
-            if ($config['create_default_folders'] && (!empty($created) || empty($user->data['last_login']))) {
-                $storage->create_default_folders();
-            }
-
             // set session vars
             $_SESSION['user_id']      = $user->ID;
             $_SESSION['username']     = $user->data['username'];
@@ -655,7 +647,15 @@ class rcmail extends rcube
                 $_SESSION['timezone'] = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_GPC);
             }
 
-            // force reloading complete list of subscribed mailboxes
+            // fix some old settings according to namespace prefix
+            $this->fix_namespace_settings($user);
+
+            // create default folders on login
+            if ($config['create_default_folders']) {
+                $storage->create_default_folders();
+            }
+
+            // clear all mailboxes related cache(s)
             $storage->clear_cache('mailboxes', true);
 
             return true;