This might not fix it, but it surely should eleviate the problem. forwardport of [18324]
Attach a file by drag & drop or click to upload
