more mail fixes