Correct message delivery information and properties