This fixes the two bugs reported by Anton Minaev in https://savannah.gnu.org/bugs/?49511.
Attach a file by drag & drop or click to upload
