Merge "small refactor" into jb-ub-mail