=== modified file 'lisp/vm-mime.el'
--- lisp/vm-mime.el	2012-01-04 02:07:12 +0000
+++ lisp/vm-mime.el	2012-01-04 13:07:20 +0000
@@ -7134,7 +7134,8 @@
 			 "unspecified")
 			(vm-mm-layout-qdisposition layout)
 		      (vm-extent-property e 'vm-mime-disposition)))
-	    (setq type (vm-extent-property e 'vm-mime-type)
+	    (setq layout nil
+		  type (vm-extent-property e 'vm-mime-type)
 		  params (vm-extent-property e 'vm-mime-parameters)
 		  forward-local-refs
 		      (car (vm-extent-property e 'vm-mime-forward-local-refs))