Support private message
Merge branch 'master' into timedcomments