clean and fix not coded mails passing