Handle message, status strings with whitespace

This fix was originally available in core location, Rolling in the same to other copies of this file.