diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 83e646c06..1fd704df5 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -1,6 +1,6 @@
 /* NGVCard+SOGo.m - this file is part of SOGo
  *
- * Copyright (C) 2009-2014 Inverse inc.
+ * Copyright (C) 2009-2015 Inverse inc.
  *
  * 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
@@ -187,29 +187,59 @@ convention:
   return element;
 }
 
+- (void) addElementWithTag: (NSString *) elementTag
+                             ofType: (NSString *) type
+                          withValue: (id) value
+{
+  NSArray *allValues;
+  NSEnumerator *list;
+  CardElement *element;
+
+  // value is either an array or a string
+  if ([value isKindOfClass: [NSString class]])
+    allValues = [NSArray arrayWithObject: value];
+  else
+    allValues = value;
+
+  // Add all values as separate elements
+  list = [allValues objectEnumerator];
+  while ((value = [list nextObject]))
+    {
+      element = [CardElement simpleElementWithTag: elementTag
+                                       singleType: type
+                                            value: value];
+      [self addChild: element];
+    }
+}
+
 - (void) _setPhoneValues: (NSDictionary *) ldifRecord
 {
-  CardElement *phone;
-
-  phone = [self elementWithTag: @"tel" ofType: @"work"];
-  [phone setSingleValue: [ldifRecord objectForKey: @"telephonenumber"] forKey: @""];
-  phone = [self elementWithTag: @"tel" ofType: @"home"];
-  [phone setSingleValue: [ldifRecord objectForKey: @"homephone"] forKey: @""];
-  phone = [self elementWithTag: @"tel" ofType: @"cell"];
-  [phone setSingleValue: [ldifRecord objectForKey: @"mobile"] forKey: @""];
-  phone = [self elementWithTag: @"tel" ofType: @"fax"];
-  [phone setSingleValue: [ldifRecord objectForKey: @"facsimiletelephonenumber"]
-                 forKey: @""];
-  phone = [self elementWithTag: @"tel" ofType: @"pager"];
-  [phone setSingleValue: [ldifRecord objectForKey: @"pager"] forKey: @""];
+  [self addElementWithTag: @"tel"
+                   ofType: @"work"
+                withValue: [ldifRecord objectForKey: @"telephonenumber"]];
+  [self addElementWithTag: @"tel"
+                   ofType: @"home"
+                withValue: [ldifRecord objectForKey: @"homephone"]];
+  [self addElementWithTag: @"tel"
+                   ofType: @"cell"
+                withValue: [ldifRecord objectForKey: @"mobile"]];
+  [self addElementWithTag: @"tel"
+                   ofType: @"fax"
+                withValue: [ldifRecord objectForKey: @"facsimiletelephonenumber"]];
+  [self addElementWithTag: @"tel"
+                   ofType: @"pager"
+                withValue: [ldifRecord objectForKey: @"pager"]];
 }
 
 - (void) _setEmails: (NSDictionary *) ldifRecord
 {
-  CardElement *mail, *homeMail;
+  CardElement *homeMail;
 
-  mail = [self elementWithTag: @"email" ofType: @"work"];
-  [mail setSingleValue: [ldifRecord objectForKey: @"mail"] forKey: @""];
+  // Emails from the configured mail fields of the source have already been extracted in
+  // [LDAPSource _fillEmailsOfEntry:intoLDIFRecord:]
+  [self addElementWithTag: @"email"
+                   ofType: @"work"
+                withValue: [ldifRecord objectForKey: @"c_emails"]];
   homeMail = [self elementWithTag: @"email" ofType: @"home"];
   [homeMail setSingleValue: [ldifRecord objectForKey: @"mozillasecondemail"] forKey: @""];
   [[self uniqueChildWithTag: @"x-mozilla-html"]
diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.m b/SoObjects/Contacts/SOGoContactLDIFEntry.m
index 4e456cbed..5d45bbcaf 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.m
@@ -92,7 +92,7 @@
   [vcard setProdID: [NSString
                       stringWithFormat: @"-//Inverse inc./SOGo %@//EN",
                       SOGoVersion]];
-  [vcard updateFromLDIFRecord: [self simplifiedLDIFRecord]];
+  [vcard updateFromLDIFRecord: [self ldifRecord]];
 
   return vcard;
 }
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index a75adfecb..368d65128 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -1,6 +1,6 @@
 /* SOGoContactSourceFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2013 Inverse inc.
+ * Copyright (C) 2006-2015 Inverse inc.
  *
  * 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
@@ -249,17 +249,26 @@
   [newRecord setObject: data forKey: @"c_cn"];
 
   // mail => emails[]
-  data = [oldRecord objectForKey: @"mail"];
+  data = [oldRecord objectForKey: @"c_emails"];
   if (data)
     {
       if ([data isKindOfClass: [NSArray class]])
         {
           if ([data count] > 0)
-            data = [data objectAtIndex: 0];
-          else
-            data = nil;
+            {
+              NSEnumerator *emails;
+              NSMutableArray *recordEmails;
+              NSString *email;
+              emails = [(NSArray *)data objectEnumerator];
+              recordEmails = [NSMutableArray arrayWithCapacity: [data count]];
+              while ((email = [emails nextObject]))
+                {
+                  [recordEmails addObject: [NSDictionary dictionaryWithObject: email forKey: @"value"]];
+                }
+              [newRecord setObject: recordEmails forKey: @"emails"];
+            }
         }
-      if (data)
+      else if (data)
         {
           NSDictionary *email;
           email = [NSDictionary dictionaryWithObjectsAndKeys: @"pref", @"type", data, @"value", nil];