More mail fixes