Merge "Fix hard dependency on account uri in eml viewer." into jb-ub-mail-ur10