Fixed logic to ensure that for cases where user may return a Message with no contentType set, the property-set content type is propagated
Fixed logic to ensure that for cases where user may return a Message with no contentType set, the property-set content type is propagated