diff --git a/WHATSNEW b/WHATSNEW
index 59938a3bb..9c3de2383 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -218,6 +218,10 @@ Fixed bugs:
    sigfile attribute.
    Bugzilla Report 44805.
 
+ * When using JavaMail all <mail> tasks used the same mail host
+   regardless of their configuration.
+   Bugzilla Report 37970.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index a6c15da25..1ef73901f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -136,7 +136,7 @@ public class MimeMailer extends Mailer {
             // 'session', which involves excessive quantities of
             // alcohol :-)
             Session sesh;
-            Authenticator auth;
+            Authenticator auth = null;
             if (SSL) {
                 try {
                     Provider p = (Provider) Class.forName(
@@ -151,13 +151,12 @@ public class MimeMailer extends Mailer {
                 props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
                 props.put("mail.smtp.socketFactory.fallback", "false");
             }
-            if (user == null && password == null) {
-                sesh = Session.getDefaultInstance(props, null);
-            } else {
+            if (user != null || password != null) {
                 props.put("mail.smtp.auth", "true");
                 auth = new SimpleAuthenticator(user, password);
-                sesh = Session.getInstance(props, auth);
             }
+            sesh = Session.getInstance(props, auth);
+
             //create the message
             MimeMessage msg = new MimeMessage(sesh);
             MimeMultipart attachments = new MimeMultipart();