Some email installation changes.