diff --git a/core/core.services.yml b/core/core.services.yml
index c814824..2274473 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -571,9 +571,12 @@ services:
   flood:
     class: Drupal\Core\Flood\DatabaseBackend
     arguments: ['@database', '@request']
+  plugin.manager.mail:
+    class: Drupal\Core\Mail\MailManager
+    parent: default_plugin_manager
   mail.factory:
     class: Drupal\Core\Mail\MailFactory
-    arguments: ['@config.factory']
+    arguments: ['@config.factory', '@plugin.manager.mail']
   plugin.manager.condition:
     class: Drupal\Core\Condition\ConditionManager
     parent: default_plugin_manager
diff --git a/core/lib/Drupal/Core/Mail/MailFactory.php b/core/lib/Drupal/Core/Mail/MailFactory.php
index dc1b706..79edf86 100644
--- a/core/lib/Drupal/Core/Mail/MailFactory.php
+++ b/core/lib/Drupal/Core/Mail/MailFactory.php
@@ -30,13 +30,16 @@ class MailFactory {
   protected $instances = array();
 
   /**
-   * Constructs a MailFActory object.
+   * Constructs a MailFactory object.
    *
    * @param \Drupal\Core\Config\ConfigFactory $configFactory
    *   The configuration factory.
+   * @param \Drupal\Core\Mail\MailManager $mailManager
+   *   The mail plugin manager.
    */
-  public function __construct(ConfigFactory $configFactory) {
+  public function __construct(ConfigFactory $configFactory, MailManager $mailManager) {
     $this->mailConfig = $configFactory->get('system.mail');
+    $this->mailManager = $mailManager;
   }
 
 
@@ -48,12 +51,12 @@ public function __construct(ConfigFactory $configFactory) {
    *
    * The selection of a particular implementation is controlled via the config
    * 'system.mail.interface', which is a keyed array.  The default
-   * implementation is the class whose name is the value of 'default' key. A
+   * implementation is the mail plugin whose id is the value of 'default' key. A
    * more specific match first to key and then to module will be used in
-   * preference to the default. To specify a different class for all mail sent
-   * by one module, set the class name as the value for the key corresponding to
-   * the module name. To specify a class for a particular message sent by one
-   * module, set the class name as the value for the array key that is the
+   * preference to the default. To specify a different plugin for all mail sent
+   * by one module, set the plugin name as the value for the key corresponding to
+   * the module name. To specify a plugin for a particular message sent by one
+   * module, set the plugin id as the value for the array key that is the
    * message id, which is "${module}_${key}".
    *
    * For example to debug all mail sent by the user module by logging it to a
@@ -61,8 +64,8 @@ public function __construct(ConfigFactory $configFactory) {
    *
    * @code
    * array(
-   *   'default' => 'Drupal\Core\Mail\PhpMail',
-   *   'user' => 'Drupal\devel\DevelMailLog',
+   *   'default' => 'PhpMail',
+   *   'user' => 'DevelMailLog',
    * );
    * @endcode
    *
@@ -71,15 +74,15 @@ public function __construct(ConfigFactory $configFactory) {
    *
    * @code
    * array(
-   *   'default' => 'Drupal\Core\Mail\PhpMail',
-   *   'user' => 'Drupal\devel\DevelMailLog',
-   *   'contact_page_autoreply' => 'Drupal\example\NullMail',
+   *   'default' => 'PhpMail',
+   *   'user' => 'DevelMailLog',
+   *   'contact_page_autoreply' => 'NullMail',
    * );
    * @endcode
    *
-   * Other possible uses for system include a mail-sending class that actually
+   * Other possible uses for system include a mail-sending plugin that actually
    * sends (or duplicates) each message to SMS, Twitter, instant message, etc,
-   * or a class that queues up a large number of messages for more efficient
+   * or a plugin that queues up a large number of messages for more efficient
    * bulk sending or for sending via a remote gateway so as to reduce the load
    * on the local server.
    *
@@ -95,32 +98,33 @@ public function __construct(ConfigFactory $configFactory) {
    * @throws \Exception
    */
   public function get($module, $key) {
-    $id = $module . '_' . $key;
+    $mail_id = $module . '_' . $key;
 
     $configuration = $this->mailConfig->get('interface');
 
-    // Look for overrides for the default class, starting from the most specific
-    // id, and falling back to the module name.
-    if (isset($configuration[$id])) {
-      $class = $configuration[$id];
+    // Look for overrides for the default mail plugin, starting from the most
+    // specific mail_id, and falling back to the module name.
+    if (isset($configuration[$mail_id])) {
+      $plugin_id = $configuration[$mail_id];
     }
     elseif (isset($configuration[$module])) {
-      $class = $configuration[$module];
+      $plugin_id = $configuration[$module];
     }
     else {
-      $class = $configuration['default'];
+      $plugin_id = $configuration['default'];
     }
 
-    if (empty($this->instances[$class])) {
-      $interfaces = class_implements($class);
+    if (empty($this->instances[$plugin_id])) {
+      $plugin = $this->mailManager->createInstance($plugin_id);
+      $interfaces = class_implements($plugin);
       if (isset($interfaces['Drupal\Core\Mail\MailInterface'])) {
-        $this->instances[$class] = new $class();
+        $this->instances[$plugin_id] = $plugin;
       }
       else {
         throw new \Exception(String::format('Class %class does not implement interface %interface', array('%class' => $class, '%interface' => 'Drupal\Core\Mail\MailInterface')));
       }
     }
-    return $this->instances[$class];
+    return $this->instances[$plugin_id];
   }
 
 }
diff --git a/core/lib/Drupal/Core/Mail/MailInterface.php b/core/lib/Drupal/Core/Mail/MailInterface.php
index d3e3173..8839c54 100644
--- a/core/lib/Drupal/Core/Mail/MailInterface.php
+++ b/core/lib/Drupal/Core/Mail/MailInterface.php
@@ -17,10 +17,10 @@
    *
    * Allows to preprocess, format, and postprocess a mail message before it is
    * passed to the sending system. By default, all messages may contain HTML and
-   * are converted to plain-text by the Drupal\Core\Mail\PhpMail implementation.
+   * are converted to plain-text by the Drupal\system\Plugin\Mail\PhpMail implementation.
    * For example, an alternative implementation could override the default
    * implementation and additionally sanitize the HTML for usage in a
-   * MIME-encoded e-mail, but still invoking the Drupal\Core\Mail\PhpMail
+   * MIME-encoded e-mail, but still invoking the Drupal\system\Plugin\Mail\PhpMail
    * implementation to generate an alternate plain-text version for sending.
    *
    * @param array $message
diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php
new file mode 100644
index 0000000..eec9f90
--- /dev/null
+++ b/core/lib/Drupal/Core/Mail/MailManager.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Mail\MailManager.
+ */
+
+namespace Drupal\Core\Mail;
+
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+
+/**
+ * Mail plugin manager.
+ */
+class MailManager extends DefaultPluginManager {
+  /**
+   * Constructs the MailManager object.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Language\LanguageManager $language_manager
+   *   The language manager.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) {
+    parent::__construct('Plugin/Mail', $namespaces);
+    $this->setCacheBackend($cache_backend, $language_manager, 'mail_backend_plugins');
+  }
+}
diff --git a/core/lib/Drupal/Core/Mail/TestMailCollector.php b/core/lib/Drupal/Core/Mail/TestMailCollector.php
index 3b3e056..a133972 100644
--- a/core/lib/Drupal/Core/Mail/TestMailCollector.php
+++ b/core/lib/Drupal/Core/Mail/TestMailCollector.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\Mail;
 
+use Drupal\system\Plugin\Mail\PhpMail;
+
 /**
  * Defines a mail sending implementation that captures sent messages to the
  * state system.
diff --git a/core/modules/system/config/system.mail.yml b/core/modules/system/config/system.mail.yml
index e3eb768..f8a0be3 100644
--- a/core/modules/system/config/system.mail.yml
+++ b/core/modules/system/config/system.mail.yml
@@ -1,2 +1,2 @@
 interface:
- default: 'Drupal\Core\Mail\PhpMail'
+ default: 'PhpMail'
diff --git a/core/lib/Drupal/Core/Mail/PhpMail.php b/core/modules/system/lib/Drupal/system/Plugin/Mail/PhpMail.php
similarity index 95%
rename from core/lib/Drupal/Core/Mail/PhpMail.php
rename to core/modules/system/lib/Drupal/system/Plugin/Mail/PhpMail.php
index 7bf290c..d98208f 100644
--- a/core/lib/Drupal/Core/Mail/PhpMail.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Mail/PhpMail.php
@@ -2,13 +2,20 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Mail\PhpMail.
+ * Definition of Drupal\system\Plugin\Mail\PhpMail.
  */
 
-namespace Drupal\Core\Mail;
+namespace Drupal\system\Plugin\Mail;
+
+use Drupal\Component\Annotation\Plugin;
+use Drupal\Core\Mail\MailInterface;
 
 /**
  * The default Drupal mail backend using PHP's mail function.
+ *
+ * @Plugin(
+ *   id = "PhpMail"
+ * )
  */
 class PhpMail implements MailInterface {
 
diff --git a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php b/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php
index f20472a..c91cec6 100644
--- a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php
+++ b/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\system_mail_failure_test;
 
-use Drupal\Core\Mail\PhpMail;
+use Drupal\system\Plugin\Mail\PhpMail;
 use Drupal\Core\Mail\MailInterface;
 
 /**
@@ -22,7 +22,7 @@
 class TestPhpMailFailure extends PhpMail implements MailInterface {
 
   /**
-   * Overrides Drupal\Core\Mail\PhpMail::mail().
+   * Overrides Drupal\system\Plugin\Mail\PhpMail::mail().
    */
   public function mail(array $message) {
     // Instead of attempting to send a message, just return failure.
