Doc improvement
Refactoring out the interaction with outgoing email service.