This closes issue #1929, the other part was fixed in the context of issue
Attach a file by drag & drop or click to upload