MS_Message update, escaped preprocessor loop

Forgot to set the bool 'done' in the preprocessor loop, Replaced MS_Message in more places.