merge #12147: make send_message correctly handle Sender and Resent- headers.