Add hack to exclude threaded messages