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