Notice the extra blank line at the end of the forwarded message.

    Fixing #9521 properly (switching to forwarding raw instead of
decoded messages) should fix this.  At the moment (post my 9521 patch),
it also appends a blank line to the end of the forwarded message.
 
- Mark