diff --git a/mail/ChangeLog b/mail/ChangeLog
index aae9930ea1..5aebe431af 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
+
+	* mail-format.c (mail_format_raw_message): Don't use the raw
+	message body as the format argument, use "%s" instead. If the raw
+	message contains %'s then it will segfault otherwise.
+
 2000-12-04  Dan Winship  <danw@helixcode.com>
 
 	* mail-config-gui.c (service_page_item_new): Fix a typo so that
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 8b78c01860..b53c811068 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -163,8 +163,7 @@ mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md)
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
 	
 	text = get_data_wrapper_text (CAMEL_DATA_WRAPPER (mime_message));
-	fprintf (stderr, "****** %s\n", text ? "yes! we have text" : "nope...no text");
-	mail_text_write (md->html, md->stream, text ? text : "");
+	mail_text_write (md->html, md->stream, "%s", text ? text : "");
 	g_free (text);
 }