mail fixes

some mail fixes