Fix the rest mails