This fixes the message issues

This fixes the issues with the messages listed in issue #4303.

Fixes #4303