E-mail Templates fixed