diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index e3fc315e..3c47ae57 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -2796,6 +2796,7 @@ public abstract class ExchangeSession {
     protected static final List<String> CONTACT_ATTRIBUTES = new ArrayList<String>();
 
     static {
+        CONTACT_ATTRIBUTES.add("uid");
         CONTACT_ATTRIBUTES.add("extensionattribute1");
         CONTACT_ATTRIBUTES.add("extensionattribute2");
         CONTACT_ATTRIBUTES.add("extensionattribute3");
@@ -2836,6 +2837,7 @@ public abstract class ExchangeSession {
         CONTACT_ATTRIBUTES.add("telephoneNumber");
         CONTACT_ATTRIBUTES.add("title");
         CONTACT_ATTRIBUTES.add("textdescription");
+        CONTACT_ATTRIBUTES.add("im");
     }
 
 
@@ -2884,19 +2886,13 @@ public abstract class ExchangeSession {
                 String propertyName = contactEntry.getKey();
                 String propertyValue = contactEntry.getValue();
                 if ("uid".equals(propertyName)) {
+                    // TODO: move to LDAP ?
                     // uid is base64, reencode to hex
                     propertyValue = new String(Hex.encodeHex(Base64.decodeBase64(propertyValue.getBytes())));
                     // if actualFilterUid is not null, exclude non exact match
                     if (actualFilterUid != null && !filterUid.equals(propertyValue)) {
                         propertyValue = null;
                     }
-                } else if (propertyName.startsWith("email")) {
-                    if (propertyValue != null && propertyValue.startsWith("\"")) {
-                        int endIndex = propertyValue.indexOf('\"', 1);
-                        if (endIndex > 0) {
-                            propertyValue = propertyValue.substring(1, endIndex);
-                        }
-                    }
                 } else if ("bday".equals(propertyName)) {
                     SimpleDateFormat parser = getExchangeZuluDateFormatMillisecond();
                     try {
diff --git a/src/java/davmail/exchange/dav/Field.java b/src/java/davmail/exchange/dav/Field.java
index 85371a60..06bbdc65 100644
--- a/src/java/davmail/exchange/dav/Field.java
+++ b/src/java/davmail/exchange/dav/Field.java
@@ -186,9 +186,13 @@ public class Field {
         createField(URN_SCHEMAS_CONTACTS, "cn"); // PR_DISPLAY_NAME 0x3001 String
         createField(URN_SCHEMAS_CONTACTS, "co"); // workAddressCountry DistinguishedPropertySetType.PublicStrings/0x00008049/String
         createField(URN_SCHEMAS_CONTACTS, "department"); // PR_DEPARTMENT_NAME 0x3A18 String
-        createField(URN_SCHEMAS_CONTACTS, "email1"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email1/String
-        createField(URN_SCHEMAS_CONTACTS, "email2"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email2/String
-        createField(URN_SCHEMAS_CONTACTS, "email3"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email3/String
+        // email with display name
+        //createField(URN_SCHEMAS_CONTACTS, "email1"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email1/String
+        //createField(URN_SCHEMAS_CONTACTS, "email2"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email2/String
+        //createField(URN_SCHEMAS_CONTACTS, "email3"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:email3/String
+        createField("email1", DistinguishedPropertySetType.Address, 0x8083, "email1"); // Email1EmailAddress
+        createField("email2", DistinguishedPropertySetType.Address, 0x8093, "email2"); // Email2EmailAddress
+        createField("email3", DistinguishedPropertySetType.Address, 0x80A3, "email3"); // Email3EmailAddress
         createField(URN_SCHEMAS_CONTACTS, "facsimiletelephonenumber"); // PR_BUSINESS_FAX_NUMBER 0x3A24 String
         createField(URN_SCHEMAS_CONTACTS, "givenName"); // PR_GIVEN_NAME 0x3A06 String
         createField(URN_SCHEMAS_CONTACTS, "homeCity"); // PR_HOME_ADDRESS_CITY 0x3A59 String
@@ -217,6 +221,7 @@ public class Field {
         createField(URN_SCHEMAS_CONTACTS, "telephoneNumber"); // PR_BUSINESS_TELEPHONE_NUMBER 0x3A08 String
         createField(URN_SCHEMAS_CONTACTS, "title"); // PR_TITLE 0x3A17 String
         createField(URN_SCHEMAS_HTTPMAIL, "textdescription"); // PR_BODY 0x1000 String
+        createField("im", DistinguishedPropertySetType.Address, 0x8062, "im"); // InstantMessagingAddress DistinguishedPropertySetType.Address/0x00008062/String
 
     }
 
@@ -227,8 +232,16 @@ public class Field {
     }
 
     protected static void createField(String alias, DistinguishedPropertySetType propertySetType, int propertyTag, String responseAlias) {
-        String name = '{' + distinguishedPropertySetMap.get(propertySetType) + "}/0x" + Integer.toHexString(propertyTag);
-        Field field = new Field(alias, SCHEMAS_MAPI_ID, name, responseAlias);
+        String name;
+        if (propertySetType == DistinguishedPropertySetType.Address) {
+            // Address namespace expects integer names
+            name = String.valueOf(propertyTag);
+        } else {
+            // Common namespace expects hex names
+            name = "0x" + Integer.toHexString(propertyTag);
+        }
+        Field field = new Field(alias, Namespace.getNamespace(SCHEMAS_MAPI_ID.getURI() +
+                '{' + distinguishedPropertySetMap.get(propertySetType) + "}/"), name, responseAlias);
         fieldMap.put(field.alias, field);
     }