more changes to mails