re-implement per-folder message threading