diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java
--- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:25:48.402313856 +0200
+++ inetlib/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:27:02.775026067 +0200
@@ -46,7 +46,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;
@@ -653,7 +652,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.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java
--- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:25:48.420311609 +0200
+++ inetlib/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:29:02.781039000 +0200
@@ -42,7 +42,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Properties;
+import java.util.HashMap;
 import java.util.TimeZone;
 
 import javax.security.auth.callback.CallbackHandler;
@@ -1140,7 +1140,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.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java
--- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:25:48.426310859 +0200
+++ inetlib/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:27:59.374957608 +0200
@@ -41,10 +41,10 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
@@ -232,7 +232,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.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java
--- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:25:48.428310610 +0200
+++ inetlib/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:26:34.107606132 +0200
@@ -38,8 +38,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;
@@ -598,7 +598,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 =