Extract id from message.

It was removed on 5c3f1926a31695acb19d8b95f3393f6696e6fdeb but still required.