Pss email problems [PD-820][PD-818]

This should be done now.

All tests pass.