Fix deletion of .message upon dir-removal