One-on-one chat fixes

Replaces #268. See comments there.
You just highlighted something I wanted to change since a long time: different models for more or less the same thing. Will have to think about how to do this in a nice way without cluttering the other model.