It feels strange to pass the messageId here, just to retrieve the DOM node afterwards, so I changed this too.