improvement to not store empty mails in any case