continues conversations/direct_messages dev

I didn't issue a pull request for this yet did I?
This is the dev we did yesterday morning.