Bugfixes to e-mail template