Backporting add782a1 from 10.6, this fixes the problem.
Attach a file by drag & drop or click to upload
