More mail fixes.