diff --git a/ChangeLog b/ChangeLog
index 701785fa2..c370d8fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartTextViewer.m
+	([UIxMailPartTextViewer -flatContentAsString]): override method by
+	replacing carriage returns with "<br />" in the result string from
+	super's implementation.
+
 	* UI/Contacts/UIxContactView.m ([UIxContactView
 	-_urlOfType:aType]): don't manage non-mailto urls through
 	javascript, let the user decide what's best for him.
diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index 40370e491..0c51f9d8f 100644
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -40,4 +40,16 @@
 
 @implementation UIxMailPartTextViewer
 
+- (NSString *)flatContentAsString
+{
+  NSString *content;
+
+  content = [[super flatContentAsString] stringByEscapingHTMLString];
+  content = [content stringByReplacingString: @"\r\n"
+                     withString: @"<br />"];
+
+  return [content stringByReplacingString: @"\n"
+                  withString: @"<br />"];
+}
+
 @end /* UIxMailPartTextViewer */