Rewrite joined message header generation
We don't use "fill" option anymore