[cleanup] followup to f86b9d2884
Merge pull request #4988 from mkortstiege/threadmsgs

[cleanup] followup to f86b9d2884