Moved the creation of the message properties and body into separate methods in AbstractClient.