Do the message line stripping the right way, fixing hangup on C++