Fix back in conversation mode

Change-Id: Ied8af2edab0990d727326b7920c96a3e9b1366cf
3 files changed