Message forwarding reworking [WIP]