Simplify the MessageId value.