Improved CiviMail body and footer