A "hide blank fields" button on the E-mail wizard.