diff --git a/Tools/NSDictionary+SOGoTool.h b/Tools/NSDictionary+SOGoTool.h
new file mode 100644
index 000000000..29edd8ae9
--- /dev/null
+++ b/Tools/NSDictionary+SOGoTool.h
@@ -0,0 +1,34 @@
+/* NSDictionary+SOGoTool.h - this file is part of SOGo
+ *
+ * Copyright (C) 2009 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef NSDICTIONARY_SOGOTOOL_H
+#define NSDICTIONARY_SOGOTOOL_H
+
+#import <Foundation/NSDictionary.h>
+
+@interface NSDictionary (SOGoToolsExtension)
+
+- (NSString *) userRecordAsLDIFEntry;
+
+@end
+
+#endif /* NSDICTIONARY_SOGOTOOL_H */
diff --git a/Tools/NSDictionary+SOGoTool.m b/Tools/NSDictionary+SOGoTool.m
new file mode 100644
index 000000000..19cf24514
--- /dev/null
+++ b/Tools/NSDictionary+SOGoTool.m
@@ -0,0 +1,150 @@
+/* NSDictionary+SOGoTool.m - this file is part of SOGo
+ *
+ * Copyright (C) 2009 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
+#import "NSDictionary+SOGoTool.h"
+
+@interface NSString (SOGoToolsExtension)
+
+- (BOOL) _isLDIFSafe;
+
+@end
+
+@implementation NSString (SOGoToolsExtension)
+
+static NSMutableCharacterSet *safeLDIFChars = nil;
+static NSMutableCharacterSet *safeLDIFStartChars = nil;
+
+- (void) _initSafeLDIFChars
+{
+  safeLDIFChars = [NSMutableCharacterSet new];
+  [safeLDIFChars addCharactersInRange: NSMakeRange (0x01, 9)];
+  [safeLDIFChars addCharactersInRange: NSMakeRange (0x0b, 2)];
+  [safeLDIFChars addCharactersInRange: NSMakeRange (0x0e, 114)];
+
+  safeLDIFStartChars = [safeLDIFChars mutableCopy];
+  [safeLDIFStartChars removeCharactersInString: @" :<"];
+}
+
+- (BOOL) _isLDIFSafe
+{
+  int count, max;
+  BOOL rc;
+
+  if (!safeLDIFChars)
+    [self _initSafeLDIFChars];
+
+  rc = YES;
+
+  max = [self length];
+  if (max > 0)
+    {
+      if ([safeLDIFStartChars characterIsMember: [self characterAtIndex: 0]])
+        for (count = 1; rc && count < max; count++)
+          rc = [safeLDIFChars
+                 characterIsMember: [self characterAtIndex: count]];
+      else
+        rc = NO;
+    }
+  
+  return rc;
+}
+
+@end
+
+@implementation NSDictionary (SOGoToolsExtension)
+
+- (void) _appendLDIFKey: (NSString *) key
+                  value: (NSString *) value
+               toString: (NSMutableString *) ldifString
+{
+  if ([value _isLDIFSafe])
+    [ldifString appendFormat: @"%@: %@\n", key, value];
+  else
+    [ldifString appendFormat: @"%@:: %@\n",
+                key, [value stringByEncodingBase64]];
+}
+
+- (void) _appendLDIFKey: (NSString *) key
+               toString: (NSMutableString *) ldifString
+{
+  id value;
+  int count, max;
+
+  value = [self objectForKey: key];
+  if ([value isKindOfClass: [NSArray class]])
+    {
+      max = [value count];
+      for (count = 0; count < max; count++)
+        [self _appendLDIFKey: key value: [value objectAtIndex: count]
+                    toString: ldifString];
+    }
+  else
+    [self _appendLDIFKey: key value: [self objectForKey: key]
+                toString: ldifString];
+}
+
+- (void) _appendObjectClassesToString: (NSMutableString *) ldifString
+{
+  NSEnumerator *classes;
+  NSString *currentClass;
+
+  classes = [[self objectForKey: @"objectClasses"] objectEnumerator];
+  while ((currentClass = [classes nextObject]))
+    [self _appendLDIFKey: @"objectClass" value: currentClass
+                toString: ldifString];
+}
+
+- (NSString *) userRecordAsLDIFEntry
+{
+  NSMutableString *ldifString;
+  NSEnumerator *keys;
+  NSString *currentKey;
+
+// {CalendarAccess = YES; MailAccess = YES; c_cn = "Wolfgang Sourdeau"; c_emails = ("wolfgang@test.com"); c_name = "wolfgang@test.com"; c_uid = "wolfgang@test.com"; cn = "wolfgang@test.com"; displayName = "Wolfgang Sourdeau"; dn = "cn=wolfgang@test.com,ou=evariste,o=inverse.ca"; givenName = Wolfgang; mail = "wolfgang@test.com"; objectClass = organizationalPerson; sn = Sourdeau; }
+
+  ldifString = [NSMutableString string];
+  [self _appendLDIFKey: @"dn" toString: ldifString];
+  [self _appendObjectClassesToString: ldifString];
+
+  keys = [[self allKeys] objectEnumerator];
+  while ((currentKey = [keys nextObject]))
+    {
+      if (!([currentKey isEqualToString: @"CalendarAccess"]
+            || [currentKey isEqualToString: @"MailAccess"]
+            || [currentKey isEqualToString: @"ContactAccess"]
+            || [currentKey hasPrefix: @"objectClass"]
+            || [currentKey hasPrefix: @"c_"]
+            || [currentKey isEqualToString: @"dn"]))
+        [self _appendLDIFKey: currentKey toString: ldifString];
+    }
+
+  return ldifString;
+}
+
+@end