Fixes to mail/evolution3