Try a fix for https://github.com/MailCore/mailcore2/issues/919