added links to email template, added email from field