*blushes* I'm sorry for the spam. I was a bit careless as I posted my last
message. :-¬ 

I worked a bit on the code. Please note that my lisp-writing is
pure diletantism. It is very probable that this is not worth anything.

Furthermore: I never made a diff before. I followed the instructions
in the Emacs Manual. I hope I made it right.

1. Patch to message.el