Cleanup MessageId