Index: MessageSupport.h
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -rfaeaa6a914a2114f9c777e0751c36fa847f78bf8
--- MessageSupport.h	(.../MessageSupport.h)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ MessageSupport.h	(.../MessageSupport.h)	(revision faeaa6a914a2114f9c777e0751c36fa847f78bf8)
@@ -48,9 +48,9 @@
 /// Record structure for a message (header + payload).
 typedef struct
 {
-    COMM_BUFFER_T    in_buffer;                         ///< Message received into this channel buffer
     MESSAGE_HEADER_T hdr;                               ///< Message header
     U08              payload[ MAX_MSG_PAYLOAD_SIZE ];   ///< Message payload
+    COMM_BUFFER_T    in_buffer;                         ///< Message received into this channel buffer
 } MESSAGE_T;
 
 /// Record structure for a wrapped message (message + CRC).