git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1146 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / MailPartViewers / UIxMailPartTextViewer.m

diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index f37364b5701fa08be3501d21e242c96e875db0bb..450c14217673352a06b833c05d8f129fb2a2d82b 100644 (file)
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -28,7 +28,9 @@
   TODO: add contained link detection.
 */
 
-#import "common.h"
+#import <NGExtensions/NSString+misc.h>
+
+#import <SoObjects/SOGo/NSString+Utilities.h>
 
 #import "UIxMailPartTextViewer.h"
 
@@ -36,14 +38,16 @@
 
 - (NSString *) flatContentAsString
 {
-  NSString *content;
+  NSMutableString *content;
+  NSString *superContent;
 
-  content = [[super flatContentAsString] stringByEscapingHTMLString];
-  content = [content stringByReplacingString: @"\r\n"
-                     withString: @"<br />"];
+  content = [NSMutableString string];
+  superContent = [[super flatContentAsString] stringByEscapingHTMLString];
+  [content appendString: [superContent stringByDetectingURLs]];
+  [content replaceString: @"\r\n" withString: @"<br />"];
+  [content replaceString: @"\n" withString: @"<br />"];
 
-  return [content stringByReplacingString: @"\n"
-                  withString: @"<br />"];
+  return content;
 }
 
 @end /* UIxMailPartTextViewer */