Tokenise incoming messages properly, so we don't lose things like multiple
spaces between words.
That shouldn't have been commited. Oops.