Update on Spam Countermeasures

[Mercurio]

Thanks for all the hard work to keep this a spam-free zone!