Clean up SPAM reporting.

Clean up SPAM reporting.

No need for separate bounce address - bouncing will necessarily alter
the headers so it is worthless for message analysis - it is only useful
for token/signature scanning.  However, this kind of scanning works just
fine if we attach the original message as a message/rfc822 part (e.g.
DSPAM).