Actually, only set the destination on the original if it's a native message.  Avoid changing foreign messages.