Refactor optional MAIL FROM args