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

* commit '4276a3bd995a3c62c09df0dde0348bbc1ab75a1a':
  Update hierarchical folders; implement this "the right way"