removed +*message for email templates