Follow-up fix for bug 711532.

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

(cherry picked from commit e8f7f03ed29cd03c83c6a924c764554a89b9a7f1)