Here's a patch for $SUBJECT. I've done some testing here, but please doublecheck it's correct before committing!
Thanks.
-- Dave PageBlog: http://pgsnake.blogspot.comTwitter: @pgsnake
EDB: http://www.enterprisedb.com