v1.21 - Preserving original To/Cc/Bcc when overriding

This helps to understand where the message intended to go originally.