This is a partial cherry-pick of eda34f74c6ad from Proton.
Attach a file by drag & drop or click to upload
