Thanks to @shinguz for helping with this. This a backport commit from 10.7
Attach a file by drag & drop or click to upload
