update mailcore2
Merge branch 'update-mailcore2' into 1.1.1-update