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

This should be done now, but it probably needs a really good check because it's easy to miss edge cases and I'm not super familiar with saved searches in the first place.

All tests pass.
It's from a digest, but I'm assuming the general point is obvious.

![digest](https://cloud.githubusercontent.com/assets/2728248/5202430/e1e046dc-754b-11e4-9715-b9aa13bfd8ac.png)