Partial fix for gh-337. See also gh-607 which complements this, but might conflict on a merge.
Attach a file by drag & drop or click to upload
