shipment mail fix