CON-1763 fix for message wall and talk tracking