Merge "Adding the via column to email." into jb-ub-mail