--- /home/users/aredridel/imap.rb.orig	2007-09-28 20:53:34.000000000 -0600
+++ /home/users/aredridel/imap.rb	2007-09-28 20:52:06.000000000 -0600
@@ -2217,10 +2217,15 @@
         match(T_SPACE)
         env = envelope
         match(T_SPACE)
-        b = body
-        match(T_SPACE)
-        lines = number
-        md5, disposition, language, extension = body_ext_1part
+        if msubtype =~ /delivery-status/i
+          md5, disposition, language = nil, nil, nil
+          extension = body_extensions
+        else
+          b = body
+          match(T_SPACE)
+          lines = number
+          md5, disposition, language, extension = body_ext_1part
+        end
         return BodyTypeMessage.new(mtype, msubtype,
                                    param, content_id,
                                    desc, enc, size,