2.4 and 2.5 are open only for security patches, which this is not, so
I've removed them from versions, and added 3.1 and 3.2, which have the
same code.

The patch looks appropriate to me, and is what the original bug report
requested.

Note that the Content-Type name parameter has been deprecated for a long
time...see for example this thread:
http://www.imc.org/ietf-822/old-archive2/msg02121.html.  Support is
still required, however, since Microsoft's .NET framework, at least,
still supports setting the parameter (see
http://msdn.microsoft.com/en-us/library/system.net.mime.contenttype.name.aspx)