Improved anti-spam protection