Mail Filter fixes related to ham/spam accounts