Fixing up the custom email template