Continued rework of message-forward based on PR comments