Import changes to mail/evolution3, taken from MC