Us/1680/email redesign

Email templates are tested but some of them fail because we don't receive the 'user' variable (the email receiver) in the template.