diff --git a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
index 12aa35b0e5..5aa73c1752 100644
--- a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
+++ b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
@@ -18,8 +18,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
 import javax.servlet.ServletContext;
 import jenkins.util.SystemProperties;
 import jenkins.util.UrlHelper;
@@ -210,11 +208,11 @@ public class JenkinsLocationConfiguration extends GlobalConfiguration implements
     }
 
     public FormValidation doCheckAdminAddress(@QueryParameter String value) {
-        try {
-            new InternetAddress(value);
+        // TODO if equal to Messages.Mailer_Address_Not_Configured(), suggest configuring it with FormValidation.warning?
+        if (Util.fixNull(value).contains("@")) {
             return FormValidation.ok();
-        } catch (AddressException e) {
-            return FormValidation.error(e.getMessage());
+        } else {
+            return FormValidation.error(Messages.JenkinsLocationConfiguration_does_not_look_like_an_email_address());
         }
     }
 
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
index d5afb130ac..ef2028aa5f 100644
--- a/core/src/main/resources/jenkins/model/Messages.properties
+++ b/core/src/main/resources/jenkins/model/Messages.properties
@@ -57,6 +57,7 @@ IdStrategy.CaseSensitive.DisplayName=Case sensitive
 IdStrategy.CaseSensitiveEmailAddress.DisplayName=Case sensitive (email address)
 
 Mailer.Address.Not.Configured=address not configured yet <nobody@nowhere>
+JenkinsLocationConfiguration.does_not_look_like_an_email_address=Does not look like an email address
 Mailer.Localhost.Error=Please set a valid host name, instead of localhost
 Mailer.NotHttp.Error=The URL is invalid, please ensure you are using http:// or https:// with a valid domain.