Mail, MailModel replaced by Template and Message