Further improvements to MessageImpl