Added message collapsing