fix: pass message to custom messages

[SHND]

Bug

The message text is not being passed to the custom message components.

Test

I didn't have the setup to test this, can someone try check. This should address this old issue here