diff --git a/imp/lib/Ftree.php b/imp/lib/Ftree.php
index fec9acc1360..0347c0cb1fa 100644
--- a/imp/lib/Ftree.php
+++ b/imp/lib/Ftree.php
@@ -173,14 +173,16 @@ public function init()
             : new IMP_Ftree_Account_Inboxonly();
         array_map(array($this, '_insertElt'), $ob->getList($mask));
 
-        /* Add remote servers. */
-        $this->insert(iterator_to_array($injector->getInstance('IMP_Remote')));
-
-        /* Add virtual folders to the tree. */
-        $iterator = IMP_Search_IteratorFilter::create(
-            IMP_Search_IteratorFilter::VFOLDER
-        );
-        array_map(array($this, 'insert'), iterator_to_array($iterator));
+        if ($access_folders) {
+            /* Add remote servers. */
+            $this->insert(iterator_to_array($injector->getInstance('IMP_Remote')));
+
+            /* Add virtual folders to the tree. */
+            $iterator = IMP_Search_IteratorFilter::create(
+                IMP_Search_IteratorFilter::VFOLDER
+            );
+            array_map(array($this, 'insert'), iterator_to_array($iterator));
+        }
 
         if ($old_track) {
             $this->eltdiff->track = true;