I've been bad about testing this -- I noticed the bug in the calendar
module / spam module, and even remembered that this happened with
ACS 4, but I didn't get around to fixing it. I will try to test
hafeez' patch in the next couple of days. Hafeez, is the latest copy
of your patch and fixes available for testing?
