diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 3cab55fb1..e5d67de73 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -144,15 +144,18 @@ static NSMutableCharacterSet *urlAfterEndingChars = nil;
   int start, length;
   NSRange workRange;
 
+//       [urlNonEndingChars addCharactersInString: @">&=,.:;\t \r\n"];
+//       [urlAfterEndingChars addCharactersInString: @"()[]{}&;<\t \r\n"];
+
   if (!urlNonEndingChars)
     {
       urlNonEndingChars = [NSMutableCharacterSet new];
-      [urlNonEndingChars addCharactersInString: @">&=,.:;\t \r\n"];
+      [urlNonEndingChars addCharactersInString: @">=,.:;\t \r\n"];
     }
   if (!urlAfterEndingChars)
     {
       urlAfterEndingChars = [NSMutableCharacterSet new];
-      [urlAfterEndingChars addCharactersInString: @"()[]{}&;<\t \r\n"];
+      [urlAfterEndingChars addCharactersInString: @"\t \r\n"];
     }
 
   start = refRange.location;