Re-enable the forwarding feature

for #1591
Merge pull request #1592 from Particular/issue_1591_reEnableMessageForwarding

Re-enable the forwarding feature