Simplified the SmtpDataFilter logic