am 03f1239a: Merge "Revert "Revert "Fix hierarchical folders""" into jb-ub-mail-ur10

* commit '03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2':
  Revert "Revert "Fix hierarchical folders""