--- mail-1.1.2/source/gnu/mail/providers/imap/IMAPMessage.java.OLD	2007-04-28 14:52:58.000000000 -0400
+++ mail-1.1.2/source/gnu/mail/providers/imap/IMAPMessage.java	2008-01-29 15:54:39.000000000 -0500
@@ -527,7 +527,11 @@
               {
                 disposition = parseAtom(d.get(0));
                 ParameterList pl = parseParameterList(d.get(1));
-                h.setHeader("Content-Disposition", disposition + pl.toString());
+                if (pl != null)
+                  {
+                    disposition += pl.toString();
+                  }
+                h.setHeader("Content-Disposition", disposition);
               }
           }
       }
