some mail changes