This patch is a followup for d78fe26 that didn't quite fix the bug.
Attach a file by drag & drop or click to upload