support Mail.app build 1822