Made changes to support handling thread based conversations.