diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java
index c55f06e965..77ad84abe8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java
@@ -50,7 +50,7 @@ public class MailSenderValidatorAutoConfiguration {
 			this.mailSender.testConnection();
 		}
 		catch (MessagingException ex) {
-			throw new IllegalStateException("Mail server is not unavailable", ex);
+			throw new IllegalStateException("Mail server is not available", ex);
 		}
 	}