Reworked message forward capability based on suggestions from original pull request