This also contains some changes to the protocol handler to make the tests pass.
Attach a file by drag & drop or click to upload
