Fix some mail-related things