Fixes #7166 Also cleans up from an aborted attempt at #5793
Attach a file by drag & drop or click to upload
