diff --git a/src/helma/scripting/rhino/extensions/MailObject.java b/src/helma/scripting/rhino/extensions/MailObject.java
index 0e2e904e..eca735c5 100644
--- a/src/helma/scripting/rhino/extensions/MailObject.java
+++ b/src/helma/scripting/rhino/extensions/MailObject.java
@@ -77,7 +77,7 @@ public class MailObject extends ScriptableObject implements Serializable {
 
         props.put("mail.smtp.host", mprops.getProperty("smtp", "mail"));
 
-        Session session = Session.getDefaultInstance(props, null);
+        Session session = Session.getInstance(props);
 
         message = new MimeMessage(session);
     }