Fixes ticket #1546 and the remaining part of ticket #1244.
Attach a file by drag & drop or click to upload
