diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 1fe94716..618bcb84 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -405,6 +405,8 @@ public class DavExchangeSession extends ExchangeSession {
         operatorMap.put(Operator.IsNull, " is null");
         operatorMap.put(Operator.IsFalse, " = false");
         operatorMap.put(Operator.IsTrue, " = true");
+        operatorMap.put(Operator.StartsWith, " = ");
+        operatorMap.put(Operator.Contains, " = ");
     }
 
     protected static class AttributeCondition extends ExchangeSession.AttributeCondition {
diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java
index 7cb8209c..c81490a4 100644
--- a/src/java/davmail/ldap/LdapConnection.java
+++ b/src/java/davmail/ldap/LdapConnection.java
@@ -28,7 +28,6 @@ import davmail.exception.DavMailException;
 import davmail.exchange.ExchangeSession;
 import davmail.exchange.ExchangeSessionFactory;
 import davmail.ui.tray.DavGatewayTray;
-import davmail.util.StringUtil;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;