diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 70bc274f6..284d7e693 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -1061,11 +1061,11 @@ static int cssEscapingCount;
 
 
       // Remove {{ and }} as they are interprated by angularJS with no way of escaping
-      regex = [NSRegularExpression regularExpressionWithPattern:@"\\{\\{" 
+      regex = [NSRegularExpression regularExpressionWithPattern:@"(\\{\\{)|({{)" 
                                   options: NSRegularExpressionCaseInsensitive error:&error];
       newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"{\\\\{"];
       result = [NSString stringWithString: newResult];
-      regex = [NSRegularExpression regularExpressionWithPattern:@"\\}\\}" 
+      regex = [NSRegularExpression regularExpressionWithPattern:@"(\\}\\})|(}})" 
                                   options: NSRegularExpressionCaseInsensitive error:&error];
       newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"}/}"];
       result = [NSString stringWithString: newResult];