Hotfix/thread messages