cleanup patch for mailscanner