Backport mail/evolution fix from trunk.