This fixes the message issues
Merge pull request #4520 from Firecage/Messagefixes

This fixes the message issues