Refactored Email message