random email cleanup

Just refactoring – see commit messages.
Should this be 'pending_approval'?