=== modified file 'lisp/vm-mime.el'
--- lisp/vm-mime.el	2012-01-03 16:49:23 +0000
+++ lisp/vm-mime.el	2012-01-04 02:07:12 +0000
@@ -2394,7 +2394,8 @@
 	  (and honor-content-disposition vm-mime-honor-content-disposition))
     (cond ((vm-mime-types-match "multipart" type)
 	   nil)
-	  ((equal disposition "attachment")
+	  ((and (equal disposition "attachment")
+		honor-content-disposition)
 	   t)
 	  ((eq disposition "inline")
 	   (cond ((eq honor-content-disposition 'internal-only)