Merged email and PSS email from the user perspective [MJ-802]

All tests pass.