=== modified file 'lisp/vm-digest.el'
--- lisp/vm-digest.el	2010-08-08 17:02:32 +0000
+++ lisp/vm-digest.el	2010-08-18 03:33:43 +0000
@@ -180,8 +180,11 @@
 		  (insert (vm-leading-message-separator folder-type))
 		  (and ident-header (insert ident-header))
 		  (setq start (point))
-		  (vm-mime-insert-mime-headers layout)
-		  (insert "\n")
+		  (when (not (string-match
+		  	      "forwarded"
+		  	      (vm-mm-layout-description layout)))
+		    (vm-mime-insert-mime-headers layout)
+		    (insert "\n"))
 		  (vm-mime-insert-mime-body layout)
 		  (vm-munge-message-separators folder-type start (point))
 		  ;; remove any leading newlines as they will