Fix mail template + controller