change order of message fields