Fixes issue#2288. Includes cleanups from Luke's pull 2243.
Attach a file by drag & drop or click to upload
