Refactored SkinnyMailer