fix user null bug
last messages. second tab
premerge commit
merge android-chat-only > iss299