minor bug fixes in the mail templates