This comment is a bit confusing, since IIUC "original" in the comment doesn't match "original" in the code. Maybe change it to "s.pack.Message's headers"?

r+ other than that.