Pulling over e-mail filter improvements from 1.3.