CHANGE: - smtp refactor