See ChangeLog.

Monotone-Parent: 5be507aec21eb7c99a5024135035b80901450a40
Monotone-Revision: 43302bf5a2ca20f32477d5cd984a6f08aeb0149b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-13T10:53:16
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/NSString+Utilities.m

@@ -142,6 +142,12 @@ static int cssEscapingCount;
 				    [self characterAtIndex: start]])
     start--;
   start++;
+
+  // In [UIxMailPartTextViewer flatContentAsString], we first escape HTML entities and then
+  // add URLs. Therefore, the brackets (inequality signs <>) have been encoded at this point.
+  if ([[self substringWithRange: NSMakeRange (start, 4)] compare: @"&lt;"] == NSOrderedSame)
+    start += 4;
+
   length = [self length] - start;
   workRange = NSMakeRange (start, length);
   workRange = [self rangeOfCharacterFromSet: urlAfterEndingChars
@@ -154,6 +160,11 @@ static int cssEscapingCount;
 			     [self characterAtIndex: (start + length - 1)]])
     length--;
 
+  // Remove trailing ">"
+  if (([self length] >= start + length + 1)
+      && [[self substringWithRange: NSMakeRange (start, length + 1)] hasSuffix: @"&gt;"])
+    length -= 3;
+
   return NSMakeRange (start, length);
 }