Comment 86 for bug 25830

> oh, btw... this patch removes pre-downloading while the dialog is up.

Please make that a separate patch, and do it first if needed for this bug.
That change needs to be done somewhat carefully in the face of how stream
converters work, and it will be simpler to debug the more localized changes.