Fixes: #2313 This is a back port of f1741d99 from master.
Attach a file by drag & drop or click to upload
