extended #16 with chat message tracking