Refactored EmailTemplate a little to give the devs more information without actually sending the mail