Messaging on message received, forward logic change

Jira Issue: WP-1024