Update chat message for android and fixed some bug