diff --git a/ChangeLog b/ChangeLog
index 2ed0371b7..d24aacfb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
 	the MailFieldNames attribute (an array) specified
 	in every LDAP-based authentication sources.
 
+	* UI/MailPartViewers/UIxMailPartTextViewer.m and
+	  UI/WebServerResources/MailerUI.css
+	We avoid replacing "\r\n" and "\n" with <br /> and
+	rather use CSS capabilities for proper formatting.
+	This is _WAY_ faster on very large mails.
+ 
 
 2007-10-05  Ludovic Marcotte  <ludovic@inverse.ca>
 
diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index 450c14217..22d41a386 100644
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -44,8 +44,6 @@
   content = [NSMutableString string];
   superContent = [[super flatContentAsString] stringByEscapingHTMLString];
   [content appendString: [superContent stringByDetectingURLs]];
-  [content replaceString: @"\r\n" withString: @"<br />"];
-  [content replaceString: @"\n" withString: @"<br />"];
 
   return content;
 }
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 97813396c..1b6a52042 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -367,7 +367,7 @@ DIV.mailer_plaincontent
 {
   position: relative;
   font-family: monospace, fixed;
-  white-space: normal;
+  white-space: pre;
   font-size: inherit;
   margin: 0px;
   padding: 0px;