Fixed https://github.com/MailCore/mailcore2/issues/683