Fixes from #1168 extracted as a followup patch for #1162
Attach a file by drag & drop or click to upload
