Follow-up fix for bug 711532.

Content-Disposition of the test case is honored now, but still not the
Content-Transfer-Encoding.