Requests for comment/UserMailer Refactor