Avoid deadlock in Messenger
Add missing file