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

* commit 'b09b7cda41b1cafce57d52707f8e33823160aafd':
  Revert "Fix hierarchical folders"