diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 12784f9b..f7948297 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -135,7 +135,7 @@ public class ExchangeSession {
      *
      * @param httpClient current Http client
      */
-    protected void configureClient(HttpClient httpClient) {
+    protected static void configureClient(HttpClient httpClient) {
         String enableProxy = Settings.getProperty("davmail.enableProxy");
         String proxyHost = null;
         String proxyPort = null;
@@ -169,7 +169,7 @@ public class ExchangeSession {
 
     }
 
-    public void checkConfig() throws IOException {
+    public static void checkConfig() throws IOException {
         try {
             String url = Settings.getProperty("davmail.url");
 
diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java
index c7e8cb48..a57d3bb0 100644
--- a/src/java/davmail/pop/PopConnection.java
+++ b/src/java/davmail/pop/PopConnection.java
@@ -54,8 +54,7 @@ public class PopConnection extends AbstractConnection {
         StringTokenizer tokens;
 
         try {
-            session = new ExchangeSession();
-            session.checkConfig();
+            ExchangeSession.checkConfig();
             sendOK("DavMail POP ready at " + new Date());
 
             for (; ;) {
@@ -96,6 +95,7 @@ public class PopConnection extends AbstractConnection {
                         } else {
                             password = tokens.nextToken();
                             try {
+                                session = new ExchangeSession();
                                 session.login(userName, password);
                                 messages = session.getAllMessages();
                                 sendOK("PASS");
diff --git a/src/java/davmail/smtp/SmtpConnection.java b/src/java/davmail/smtp/SmtpConnection.java
index dbd0eeee..4bebf08b 100644
--- a/src/java/davmail/smtp/SmtpConnection.java
+++ b/src/java/davmail/smtp/SmtpConnection.java
@@ -31,8 +31,7 @@ public class SmtpConnection extends AbstractConnection {
 
 
         try {
-            session = new ExchangeSession();
-            session.checkConfig();
+            ExchangeSession.checkConfig();
             sendClient("220 DavMail SMTP ready at " + new Date());
             for (; ;) {
                 line = readClient();