aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-component.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-component.c')
-rw-r--r--mail/mail-component.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/mail-component.c b/mail/mail-component.c
index e4e2cbb6c5..036ad0a667 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -368,6 +368,7 @@ static void
mc_startup(MailComponent *mc)
{
static int started = 0;
+ GConfClient *gconf;
if (started)
return;
@@ -375,7 +376,11 @@ mc_startup(MailComponent *mc)
mc_setup_local_store(mc);
load_accounts(mc, mail_config_get_accounts());
- vfolder_load_storage();
+
+ gconf = mail_config_get_gconf_client();
+
+ if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/enable_vfolders", NULL))
+ vfolder_load_storage();
}
static void