@bct: When moving the OTR stuff, you would've needed to adjust the XHTML killing part. This patch fixes it. I didn't even notice since I have XHTML disabled globally.