More changes to e-mail monitoring