Thanks for the advice. Apologies for the crappy formatting on my last message. I think my system mail client and my Emacs mail client had a disagreement and it ended up looking like that. So now I'm sending this directly via the Emacs mail client (hopefully it doesn't screw stuff up either). The requested patch is attached now to this message, so please let me know if you need anything else.