diff --git a/SoObjects/Contacts/SOGoContactFolder.h b/SoObjects/Contacts/SOGoContactFolder.h
index 2843851e0..68029eed9 100644
--- a/SoObjects/Contacts/SOGoContactFolder.h
+++ b/SoObjects/Contacts/SOGoContactFolder.h
@@ -59,6 +59,7 @@
    Possible vCard properties are:
 
    - EMAIL
+   - MAIL
    - FN
    - N
    - ORG
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index 8db23efc3..df9a237ae 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -341,7 +341,7 @@ Class SOGoContactSourceFolderK;
                              folderWithName: name
                              andDisplayName: srcDisplayName
                                 inContainer: self];
-                  [folder setSource: [um sourceWithID: name]];
+                  [(SOGoContactSourceFolder *)folder setSource: [um sourceWithID: name]];
                 }
               domain = [domains nextObject];
             }
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 59b55d44f..b40eb7cd3 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -487,6 +487,7 @@ static NSArray *folderListingFields = nil;
                                                   [self nameFields],  @"fn",
                                                 [self nameFields],    @"n",
                                                 @"c_mail",            @"email",
+                                                @"c_mail",            @"mail",
                                                 @"c_telephonenumber", @"tel",
                                                 @"c_o",               @"org",
                                                 @"c_l",               @"adr",
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index 686a779a4..adce42dd3 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -166,6 +166,7 @@
   isValid = ([newString isEqualToString: @"fn"]
              || [newString isEqualToString: @"n"]
              || [newString isEqualToString: @"email"]
+             || [newString isEqualToString: @"mail"]
              || [newString isEqualToString: @"tel"]
              || [newString isEqualToString: @"org"]
              || [newString isEqualToString: @"adr"]);
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 2768ab832..40fa2481c 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -930,6 +930,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
                                                    @"cn",            @"fn",
                                                  @"cn",              @"n",
                                                  @"mail",            @"email",
+                                                 @"mail",            @"mail",
                                                  @"telephonenumber", @"tel",
                                                  @"o",               @"org",
                                                  @"l",               @"adr",
diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index 6b167161a..2f566b012 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -743,6 +743,7 @@
                                                   @"c_cn",            @"fn",
                                                 @"c_cn",              @"n",
                                                 @"mail",              @"email",
+                                                @"mail",              @"mail",
                                                 @"c_telephonenumber", @"tel",
                                                 @"c_o",               @"org",
                                                 @"c_l",               @"adr",