Refactored Mail