         addRemoveFolderButton = UIBarButtonItem()
         items.append(addRemoveFolderButton)
 
-        updateAddRemoveFolderButton()
+        updateAddRemoveFolderButton(false)
         
         items.append(UIBarButtonItem(barButtonSystemItem: .FlexibleSpace, target: self, action: nil))
 

        }
    }
    
    func disableTableEditingMode() {
        dispatch_async(dispatch_get_main_queue()) {
            if self.tableView.editing {
                self.switchTableEditingMode()
            }
        }
    }
    

     * the button disappears when not in edit mode in both cases. When a subfolder is not empty,
     * pressing the remove folder button will show an error message explaining why (suboptimal, but allows to expose this functionality)
     */
    func updateAddRemoveFolderButton(tableIsEditing:Bool) {
        
        if !tableIsEditing {
            addRemoveFolderButton.enabled = false
            addRemoveFolderButton.title = nil
            return
