Merge "Update hierarchical folders; implement this "the right way"" into jb-ub-mail