random email cleanup

See commit messages.