Also added two XXX comments about lingering thread unsafeness.
Attach a file by drag & drop or click to upload