Merge "Added the via domain to the UI." into jb-ub-mail