Fixes to mail/evolution-ews from MC