fix mail templates, improve SmtpMailService (TBC)