--- mml.el~	2007-08-24 08:17:16 +0000
+++ mml.el	2007-08-24 10:18:56 +0000
@@ -535,15 +535,18 @@
 			;; insert a "; format=flowed" string unless the
 			;; user has already specified it.
 			(setq flowed (null (assq 'format cont)))))
-		    ;; Prefer `utf-8' for text/calendar parts.
+		    ;; Prefer `utf-8' and QP for text/calendar parts.
 		    (if (or charset
 			    (not (string= type "text/calendar")))
-			(setq charset (mm-encode-body charset))
+			(setq charset (mm-encode-body charset)
+			      encoding (mm-body-encoding
+					charset (cdr (assq 'encoding cont))))
 		      (let ((mm-coding-system-priorities
 			     (cons 'utf-8 mm-coding-system-priorities)))
-			(setq charset (mm-encode-body))))
-		    (setq encoding (mm-body-encoding
-				    charset (cdr (assq 'encoding cont))))))
+			(setq charset (mm-encode-body)
+			      encoding (mm-body-encoding
+					charset (or (cdr (assq 'encoding cont))
+						    'quoted-printable)))))))
 		  (setq coded (buffer-string)))
 		(mml-insert-mime-headers cont type charset encoding flowed)
 		(insert "\n")