Fixed emtpy subject and message
Update email template