This also makes the changes of a3949fe1 applicable in both cases.
Attach a file by drag & drop or click to upload
