message context refactored
new email template model