Fix nested message headers