(cherry picked from commit 72c07065860ad8e70674714532da05e373acdc88) Plus an extra security check.
Attach a file by drag & drop or click to upload
