We used "headers" rather than "message_headers".

  But otherwise this is implemented now.