Move charset / content-type into header.bare