diff -uNr inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java
--- inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:18:21.512067374 +0200
+++ inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:19:07.024373510 +0200
@@ -45,7 +45,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
@@ -555,7 +554,7 @@
           String[] m = new String[] { mechanism };
           CallbackHandler ch = new SaslCallbackHandler(username, password);
           // Avoid lengthy callback procedure for GNU Crypto
-          Properties p = new Properties();
+          HashMap p = new HashMap();
           p.put("gnu.crypto.sasl.username", username);
           p.put("gnu.crypto.sasl.password", password);
           SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
diff -uNr inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java
--- inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:18:21.531064997 +0200
+++ inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:20:28.841137790 +0200
@@ -39,8 +39,8 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
@@ -220,7 +220,7 @@
           String[] m = new String[] { mechanism };
           CallbackHandler ch = new SaslCallbackHandler (username, password);
           // Avoid lengthy callback procedure for GNU Crypto
-          Properties p = new Properties ();
+          HashMap p = new HashMap();
           p.put ("gnu.crypto.sasl.username", username);
           p.put ("gnu.crypto.sasl.password", password);
           SaslClient sasl =
diff -uNr inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java
--- inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:18:21.533064747 +0200
+++ inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:21:16.996113371 +0200
@@ -37,8 +37,8 @@
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
@@ -567,7 +567,7 @@
           String[] m = new String[] { mechanism };
           CallbackHandler ch = new SaslCallbackHandler (username, password);
           // Avoid lengthy callback procedure for GNU Crypto
-          Properties p = new Properties ();
+          HashMap p = new HashMap();
           p.put ("gnu.crypto.sasl.username", username);
           p.put ("gnu.crypto.sasl.password", password);
           SaslClient sasl =