Merge "Removing email address from source." into jb-ub-mail