diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 4318c9a05..9ac964b0e 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2517,8 +2517,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 - (NSURL *) folderTableURL
 {
-  NSString *urlString, *ocFSTableName;
+  NSMutableString *ocFSTableName;
   NSMutableArray *parts;
+  NSString *urlString;
   SOGoUser *user;
 
   if (!folderTableURL)
@@ -2537,10 +2538,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           /* If "OCSFolderInfoURL" is properly configured, we must have 5
              parts in this url. We strip the '-' character in case we have
              this in the domain part - like foo@bar-zot.com */
-          ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
-                                    [[[user loginInDomain] asCSSIdentifier] 
-                                      stringByReplacingOccurrencesOfString: @"-"
-                                                                withString: @"_"]];
+          ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
+                                           [[user loginInDomain] asCSSIdentifier]];
+          [ocFSTableName replaceOccurrencesOfString: @"-"
+                                         withString: @"_"
+                                            options: 0
+                                              range: NSMakeRange(0, [ocFSTableName length])];
           [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
           folderTableURL
             = [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];
diff --git a/NEWS b/NEWS
index f4527acc1..b9c6b6cd1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,17 +2,18 @@
 -------------------
 
 New features
- - Allow including or not freebusy info from subscribed calendars
- - Now possible to set an autosave timer for draft messages
- - Now possible to set alarms on event invitations (#76)
+ - allow including or not freebusy info from subscribed calendars
+ - now possible to set an autosave timer for draft messages
+ - now possible to set alarms on event invitations (#76)
 
 Enhancements
  - updated CKEditor to version 4.4.6 and added the 'Source Area' plugin
  - avoid testing for IMAP ANNOTATION when X-GUID is available (#3018)
 
 Bug fixes
- - Fix for privacy and categories for EAS (#3022)
- - Correctly set MeetingStatus for EAS on iOS devices
+ - fix for privacy and categories for EAS (#3022)
+ - correctly set MeetingStatus for EAS on iOS devices
+ - Ubuntu Lucid fixes for EAS
  
 2.2.11a (2014-12-10)
 --------------------
diff --git a/Tools/SOGoToolManageEAS.m b/Tools/SOGoToolManageEAS.m
index 48e143ded..0d8a7d772 100644
--- a/Tools/SOGoToolManageEAS.m
+++ b/Tools/SOGoToolManageEAS.m
@@ -104,17 +104,17 @@ typedef enum
 
 - (BOOL) run
 {
-  NSString *userId;
-  SOGoManageEASCommand cmd;
+  NSString *urlString, *deviceId, *userId;
+  NSMutableString *ocFSTableName;
   SOGoCacheGCSObject *oc, *foc;
-  NSString *urlString, *ocFSTableName, *deviceId;
   NSURL *folderTableURL;
   NSMutableArray *parts;
   NSArray *entries;
   id cacheEntry;
- 
-  BOOL rc;
+
+  SOGoManageEASCommand cmd;
   int i, max;
+  BOOL rc;
   
   max = [sanitizedArguments count];
   rc = NO;
@@ -141,10 +141,12 @@ typedef enum
           /* If "OCSFolderInfoURL" is properly configured, we must have 5
              parts in this url. We strip the '-' character in case we have
              this in the domain part - like foo@bar-zot.com */
-          ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
-                                    [[[user loginInDomain] asCSSIdentifier]
-                                      stringByReplacingOccurrencesOfString: @"-"
-                                                                withString: @"_"]];
+          ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
+                                           [[user loginInDomain] asCSSIdentifier]];
+          [ocFSTableName replaceOccurrencesOfString: @"-"
+                                         withString: @"_"
+                                            options: 0
+                                              range: NSMakeRange(0, [ocFSTableName length])];
           [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
           folderTableURL
             = [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];