=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2014-09-24 10:25:11 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2014-09-29 16:33:27 +0000 @@ -162,7 +162,7 @@ email.setHostName( hostName ); email.setFrom( defaultIfEmpty( sender, FROM_ADDRESS ), FROM_NAME ); email.setSmtpPort( port ); - email.setTLS( tls ); + email.setStartTLSEnabled( tls ); if ( username != null && password != null ) {