Further improvements to the mail templates