Merge "Fixup position of folder icon/ folder name." into jb-ub-mail