Fix contact handshake.
smaller stuff
Fix merge.
Add NewMessageView.
Introduce channel info.

Untested.