more mail fixes;