Fixed some mail issues