Message: rearrange some getters and setters

Put the setters and getters for each property together.
Also declare the enum-based accessors first because the
documentation of the convenience ones refers to them.