Merge "Fix folder & account name not showing on back" into jb-ub-mail-ur9