More mail bug fixes