If `message-sendmail-envelope-from' is `header' then the envelope-from
will be the original sender's address, not the resender's.  But when
resending, the envelope-from should be the resender's address.  Defuse
that particular case.

-- 
Sean Whitton