Refactored Mail Model