Added MessageId and CorrelationId fields to properties we extract from messages.