replaced handcrafted messages with messageheader