Merge "Fixup position of folder icons." into jb-ub-mail