Correct message dlivery information and properties