still, don't you think this condition should go inside `updateHeaderData` ?

Also, (sorry it's my fault), the condition should be `if (MessageManager.currentThread != null)`