improved message threading