Also, update a few cases missed by the initial patch.
Attach a file by drag & drop or click to upload
