Comment 1 for bug 545262

Easy, clean little patch attached here.

I'll gladly upload this, if I can get someone to verify that this functionality is okay by the Foundations cabal. Ideally, it would get some support from the server-papercuts project too ;-)