Apply patch from MailCore2
Merge branch 'ApplyPatch'