refactored e-mail