merge lastest MailCore