Fixed encrypted messages
Merge branch 'master' of github.com:vysheng/tg
Merge remote-tracking branch 'upstream/master'