      * 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() {
-        
-        if !tableView.editing {
+    func updateAddRemoveFolderButton(tableIsEditing:Bool) {
+        
+        if !tableIsEditing {
             addRemoveFolderButton.enabled = false
             addRemoveFolderButton.title = nil
             return

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

        }
        
        dispatch_async(dispatch_get_main_queue()) {

            let editMode:Bool = forceOff ? false : !self.tableView.editing
            self.tableView.setEditing(editMode, animated: forceOff ? false : true)
            //only when the 'edit' button has been pressed
            self.updateAddRemoveFolderButton(editMode)
            self.updateEditBookmarksButton(editMode)
        }
    }
    
    func updateEditBookmarksButton(tableIsEditing:Bool) {
        self.editBookmarksButton.title = tableIsEditing ? NSLocalizedString("Done", comment: "Done") : NSLocalizedString("Edit", comment: "Edit")
        self.editBookmarksButton.style = tableIsEditing ? .Done : .Plain

    }
    
    /*
