Handle message, status strings with whitespaces

This fix was originally made to it's previous location in Core. Rolling in the same onto it's other copies.