Fix the hostname composition for the message headers