added comments to X- headers and removed X-Sender