Fix <user> thought <user> <msg>

I don't know what was going on before... or even how it worked.
This endeavors to be clearer (and less error prone).