Re: rev 14288 - Proper fix is not to define a new object; code was assuming header that was already defined was placed in the message object (which it was not). Also fix indention issues