Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
We could also do this in the message pool itself, but I'm not sure if it's worth it?