I think I have the minimal patch that will solve this issue.  The other patch included me mucking 
with mailer.get_standard_message, and while I think that's still correct, it's not necessary to fix 
the issue at hand.

So, here is a smaller patch that just touches mailer.bounce_message.

I'd love to help write unit tests for this, but I'm 1) a novice at that, and 2) currently too busy 
(transitioning to roundup as it happens).  Sorry I can't be of more help.