fixed some mail bug