diff --git a/ChangeLog b/ChangeLog
index e7cd85b12..bd3c795ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartTextViewer.m ([NSString
+	-stringByConvertingCRLNToHTML]): build the returned NSString
+	without the ending \0.
+
 2007-11-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartICalViewer.m
diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index d4ff0ccdc..6e9b6a26a 100644
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -83,7 +83,7 @@
   *destChar = 0;
 
   convertedString = [[NSString alloc] initWithBytes: newString
-				      length: (destChar + 1 - newString)
+				      length: (destChar - newString)
 				      encoding: NSUTF8StringEncoding];
   [convertedString autorelease];
   free (newString);