Take a look at Thunderbirds redirect plugin. It works well, and only adds a few lines to the message, along with your mail server's lines. I have a script that strips those lines off, and the message as delivered to the client is now what is trained upon.
Unfortunately, it adds Resent-From: and Resent-To... No good.
