Fix to prevent empty fields from being printed in email messages