diff --git a/composer.lock b/composer.lock
index 6622a70a91..4d652004ce 100644
--- a/composer.lock
+++ b/composer.lock
@@ -689,24 +689,29 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "1.2.14",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9"
+                "reference": "bc31baa11ea2883e017f0a10d9722ef9d50eac1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5642614492f0ca2064c01d60cc33284cc2f731a9",
-                "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/bc31baa11ea2883e017f0a10d9722ef9d50eac1c",
+                "reference": "bc31baa11ea2883e017f0a10d9722ef9d50eac1c",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "^1.0.1",
-                "php": ">= 5.3.3"
+                "php": ">= 5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.24"
+                "dominicsayers/isemail": "dev-master",
+                "phpunit/phpunit": "^4.8.0",
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
             },
             "type": "library",
             "extra": {
@@ -715,8 +720,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Egulias\\": "src/"
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "EmailValidator"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -728,7 +733,7 @@
                     "name": "Eduardo Gulias Davis"
                 }
             ],
-            "description": "A library for validating emails",
+            "description": "A library for validating emails against several RFCs",
             "homepage": "https://github.com/egulias/EmailValidator",
             "keywords": [
                 "email",
@@ -737,7 +742,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2017-02-03T22:48:59+00:00"
+            "time": "2017-01-30T22:07:36+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -2613,7 +2618,7 @@
                 "testing",
                 "web"
             ],
-            "time": "2017-02-06T09:59:54+00:00"
+            "time": "2017-02-06 09:59:54"
         },
         {
             "name": "behat/mink-browserkit-driver",
diff --git a/core/composer.json b/core/composer.json
index 0d103002c7..98b7adefe7 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -26,7 +26,7 @@
         "easyrdf/easyrdf": "^0.9",
         "zendframework/zend-feed": "^2.4",
         "stack/builder": "^1.0",
-        "egulias/email-validator": "^1.2",
+        "egulias/email-validator": "^2.0",
         "masterminds/html5": "^2.1",
         "symfony/psr-http-message-bridge": "^1.0",
         "zendframework/zend-diactoros": "^1.1",
diff --git a/core/core.services.yml b/core/core.services.yml
index 796ece3e9b..e5a8c66950 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1641,7 +1641,11 @@ services:
     tags:
       - { name: placeholder_strategy, priority: -1000 }
   email.validator:
+    class: Drupal\Component\Utility\EmailValidator
+    arguments: ['@email.validator_utility']
+  email.validator_utility:
     class: Egulias\EmailValidator\EmailValidator
+    public: false
   update.post_update_registry:
     class: Drupal\Core\Update\UpdateRegistry
     factory: ['@update.post_update_registry_factory', create]
diff --git a/core/lib/Drupal/Component/Utility/EmailValidator.php b/core/lib/Drupal/Component/Utility/EmailValidator.php
new file mode 100644
index 0000000000..2133e724c8
--- /dev/null
+++ b/core/lib/Drupal/Component/Utility/EmailValidator.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\Component\Utility;
+
+use Egulias\EmailValidator\EmailValidator as EmailValidatorUtility;
+use Egulias\EmailValidator\EmailLexer;
+
+/**
+ * Validates email addresses.
+ */
+class EmailValidator implements EmailValidatorInterface {
+
+  /**
+   * The email validator utility.
+   *
+   * @var \Egulias\EmailValidator\EmailValidator
+   */
+  protected $emailValidator;
+
+  /**
+   * Constructs an EmailValidator.
+   *
+   * @param EmailValidatorUtility $emailValidator
+   *   The email validator utility.
+   */
+  public function __construct(EmailValidatorUtility $emailValidator) {
+    parent::__construct();
+    $this->emailValidator = $emailValidator;
+  }
+
+  /**
+   * Returns true if the given email is valid.
+   *
+   * @param string $email
+   *   The email you want to validate.
+   * @param EmailLexer $emailLexer
+   *   The email lexer.
+   *
+   * @return bool
+   */
+  public function isValid($email, EmailLexer $emailLexer) {
+    return $this->emailValidator->isValid($email, $emailLexer);
+  }
+
+
+  /**
+   * @return bool
+   */
+  public function getError() {
+    return $this->emailValidator->getError();
+  }
+
+  /**
+   * @return array
+   */
+  public function getWarnings()
+  {
+    return $this->emailValidator->getWarnings();
+  }
+
+}
diff --git a/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php b/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php
new file mode 100644
index 0000000000..9c61a13c4e
--- /dev/null
+++ b/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Drupal\Component\Utility;
+
+use Egulias\EmailValidator\Validation\EmailValidation;
+
+/**
+ * Validates email addresses.
+ */
+interface EmailValidatorInterface extends EmailValidation {
+
+}
diff --git a/core/modules/action/src/Plugin/Action/EmailAction.php b/core/modules/action/src/Plugin/Action/EmailAction.php
index 0f469ec6bf..d979061fb4 100644
--- a/core/modules/action/src/Plugin/Action/EmailAction.php
+++ b/core/modules/action/src/Plugin/Action/EmailAction.php
@@ -3,6 +3,7 @@
 namespace Drupal\action\Plugin\Action;
 
 use Drupal\Component\Render\PlainTextOutput;
+use Drupal\Component\Utility\EmailValidatorInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Action\ConfigurableActionBase;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -13,7 +14,6 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Utility\Token;
 use Psr\Log\LoggerInterface;
-use Egulias\EmailValidator\EmailValidator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -65,7 +65,7 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
   /**
    * The email validator.
    *
-   * @var \Egulias\EmailValidator\EmailValidator
+   * @var \Drupal\Component\Utility\EmailValidatorInterface
    */
   protected $emailValidator;
 
@@ -88,10 +88,10 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
    *   The mail manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
-   * @param \Egulias\EmailValidator\EmailValidator $email_validator
+   * @param \Drupal\Component\Utility\EmailValidatorInterface $email_validator
    *   The email validator.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, EntityManagerInterface $entity_manager, LoggerInterface $logger, MailManagerInterface $mail_manager, LanguageManagerInterface $language_manager, EmailValidator $email_validator) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, EntityManagerInterface $entity_manager, LoggerInterface $logger, MailManagerInterface $mail_manager, LanguageManagerInterface $language_manager, EmailValidatorInterface $email_validator) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->token = $token;
diff --git a/core/modules/contact/src/ContactFormEditForm.php b/core/modules/contact/src/ContactFormEditForm.php
index aa94540bb9..b86222e6cc 100644
--- a/core/modules/contact/src/ContactFormEditForm.php
+++ b/core/modules/contact/src/ContactFormEditForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\contact;
 
+use Drupal\Component\Utility\EmailValidatorInterface;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -9,7 +10,6 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\ConfigFormBaseTrait;
 use Drupal\Core\Form\FormStateInterface;
-use Egulias\EmailValidator\EmailValidator;
 use Drupal\Core\Path\PathValidatorInterface;
 use Drupal\Core\Render\Element\PathElement;
 
@@ -22,7 +22,7 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
   /**
    * The email validator.
    *
-   * @var \Egulias\EmailValidator\EmailValidator
+   * @var \Drupal\Component\Utility\EmailValidatorInterface
    */
   protected $emailValidator;
 
@@ -36,12 +36,12 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
   /**
    * Constructs a new ContactFormEditForm.
    *
-   * @param \Egulias\EmailValidator\EmailValidator $email_validator
+   * @param \Drupal\Component\Utility\EmailValidatorInterface $email_validator
    *   The email validator.
    * @param \Drupal\Core\Path\PathValidatorInterface $path_validator
    *   The path validator service.
    */
-  public function __construct(EmailValidator $email_validator, PathValidatorInterface $path_validator) {
+  public function __construct(EmailValidatorInterface $email_validator, PathValidatorInterface $path_validator) {
     $this->emailValidator = $email_validator;
     $this->pathValidator = $path_validator;
   }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 90e62910ef..342b257dc6 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1965,3 +1965,10 @@ function system_update_8400(&$sandbox) {
 
   $sandbox['#finished'] = $sandbox['current'] == $sandbox['max'];
 }
+
+/**
+ * Clear caches due to changes in email validator service.
+ */
+function system_update_8401() {
+  // Empty update to cause a cache rebuild.
+}
diff --git a/core/modules/update/src/UpdateSettingsForm.php b/core/modules/update/src/UpdateSettingsForm.php
index 1860269d60..c938312d45 100644
--- a/core/modules/update/src/UpdateSettingsForm.php
+++ b/core/modules/update/src/UpdateSettingsForm.php
@@ -2,11 +2,11 @@
 
 namespace Drupal\update;
 
+use Drupal\Component\Utility\EmailValidatorInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Egulias\EmailValidator\EmailValidator;
 
 /**
  * Configure update settings for this site.
@@ -16,17 +16,17 @@ class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInt
   /**
    * The email validator.
    *
-   * @var \Egulias\EmailValidator\EmailValidator
+   * @var \Drupal\Component\Utility\EmailValidatorInterface
    */
   protected $emailValidator;
 
   /**
    * Constructs a new UpdateSettingsForm.
    *
-   * @param \Egulias\EmailValidator\EmailValidator $email_validator
+   * @param \Drupal\Component\Utility\EmailValidatorInterface $email_validator
    *   The email validator.
    */
-  public function __construct(EmailValidator $email_validator) {
+  public function __construct(EmailValidatorInterface $email_validator) {
     $this->emailValidator = $email_validator;
   }