e-mails fixes