same time chat history 2

Change-Id: I5d963e70cb12701aa55525a80c686ba20321e926