One-on-one chat fixes

Replaces #268. See comments there.