diff --git a/camel/ChangeLog b/camel/ChangeLog
index 31ef332e00..8978f68df3 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-30  Matt Loper  <matt@helixcode.com>
+
+	* camel-formatter.c (handle_text_plain): Use <pre> tag to force
+	the use of monospaced fonts.
+
 2000-03-30  Dan Winship  <danw@helixcode.com>
 
 	* camel-service.c (camel_service_getport): Add a htons in the
diff --git a/camel/camel-formatter.c b/camel/camel-formatter.c
index bed3f4fc5a..1bfbbcf0a7 100644
--- a/camel/camel-formatter.c
+++ b/camel/camel-formatter.c
@@ -639,6 +639,8 @@ handle_text_plain (CamelFormatter *formatter, CamelDataWrapper *wrapper)
 	
 	camel_stream_write_string (formatter->priv->stream,
 				   "\n<!-- text/plain below -->\n");
+	camel_stream_write_string (formatter->priv->stream,
+				   "<pre>\n");
 
 	if (strcmp (wrapper->mime_type->subtype, "richtext") == 0) {
 
@@ -688,6 +690,8 @@ handle_text_plain (CamelFormatter *formatter, CamelDataWrapper *wrapper)
 		camel_stream_write_string (formatter->priv->stream,
 					   "<b>(empty)</b>");
 	}
+	camel_stream_write_string (formatter->priv->stream,
+				   "</pre>\n");	
 	
 	debug ("handle_text_plain: exiting\n");
 }