Sync with marcuscom and fix mail/evolution build with a kludge for now