diff --git a/ChangeLog b/ChangeLog
index d94792740..5638bf575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/JavascriptAPIExtensions.js
+	(String.asCSSIdentifier): same as below.
+
+	* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
+	"_P_" as escaping sequence for "+".
+
 2012-02-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m (+webdavAclManager): must include
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 094dd595d..77607775e 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -288,12 +288,12 @@ static int cssEscapingCount;
   int count;
 
   strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
-                     @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", nil];
+                     @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", @"_P_", nil];
   [strings retain];
   cssEscapingStrings = [strings asPointersOfObjects];
 
   characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":",
-                        @",", @" ", @"'", @"&", nil];
+                        @",", @" ", @"'", @"&", @"+", nil];
   cssEscapingCount = [strings count];
   cssEscapingCharacters = NSZoneMalloc (NULL,
                                         (cssEscapingCount + 1)
diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js
index 973082d14..32c7a7034 100644
--- a/UI/WebServerResources/JavascriptAPIExtensions.js
+++ b/UI/WebServerResources/JavascriptAPIExtensions.js
@@ -70,8 +70,10 @@ String.prototype.asDate = function () {
 };
 
 String.prototype.asCSSIdentifier = function() {
-    var characters = [ '_'  , '\\.', '#'  , '@'  , '\\*', ':'  , ','   , ' '   , "'", '&' ];
-    var escapeds =   [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_', '_AM_' ];
+    var characters = [ '_'  , '\\.', '#'  , '@'  , '\\*', ':'  , ','   , ' '
+                       , "'", '&', '+' ];
+    var escapeds =   [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_',
+                       '_SP_', '_SQ_', '_AM_', '_P_' ];
 
     var newString = this;
     for (var i = 0; i < characters.length; i++) {