Index: JndiJavamailMailSender.java =================================================================== --- JndiJavamailMailSender.java (revision 7332) +++ JndiJavamailMailSender.java (working copy) @@ -52,7 +52,7 @@ { Context ctx = new InitialContext(); Session s = (Session) ctx.lookup( jndiSessionName ); - Properties props = new Properties( s.getProperties() ); + Properties props = s.getProperties(); if ( "smtps".equals( props.getProperty( AbstractJavamailMailSender.MAIL_TRANSPORT_PROTOCOL ) ) ) { @@ -64,7 +64,7 @@ props.put( AbstractJavamailMailSender.MAIL_SMTP_TIMEOUT, "30000" ); } - return Session.getInstance( props, null ); + return s; } catch ( NamingException e ) {