pushed two bugs in message conversation