modules/store/commerce_store.module       | 2 +-
 tests/src/Kernel/MailHandlerTest.php      | 2 +-
 tests/src/Kernel/MailHandlerThemeTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/store/commerce_store.module b/modules/store/commerce_store.module
index 761bd8a4..6bfdd43b 100644
--- a/modules/store/commerce_store.module
+++ b/modules/store/commerce_store.module
@@ -19,7 +19,7 @@ function commerce_store_mail_alter(&$message) {
     $current_store = \Drupal::service('commerce_store.current_store');
     $current_store = $current_store->getStore();
     if ($current_store) {
-      $message['from'] = $current_store->getEmail();
+      $message['from'] = $current_store->label() . '<' . $current_store->getEmail() . '>';
     }
   }
 }
diff --git a/tests/src/Kernel/MailHandlerTest.php b/tests/src/Kernel/MailHandlerTest.php
index ddcd968f..9c1ee021 100644
--- a/tests/src/Kernel/MailHandlerTest.php
+++ b/tests/src/Kernel/MailHandlerTest.php
@@ -51,7 +51,7 @@ class MailHandlerTest extends CommerceKernelTestBase {
     $this->assertFalse(isset($email['headers']['Cc']));
     $this->assertFalse(isset($email['headers']['Bcc']));
     $this->assertFalse(isset($email['headers']['Reply-to']));
-    $this->assertEquals($this->store->getEmail(), $email['from']);
+    $this->assertEquals($this->store->label() . '<' . $this->store->getEmail() . '>', $email['from']);
     $this->assertEquals('Test subject', $email['subject']);
     $this->assertContains('Mail Handler Test', $email['body']);
     $this->assertEquals($language_manager->getCurrentLanguage()->getId(), $email['langcode']);
diff --git a/tests/src/Kernel/MailHandlerThemeTest.php b/tests/src/Kernel/MailHandlerThemeTest.php
index b079c523..f3b2ae68 100644
--- a/tests/src/Kernel/MailHandlerThemeTest.php
+++ b/tests/src/Kernel/MailHandlerThemeTest.php
@@ -74,7 +74,7 @@ class MailHandlerThemeTest extends CommerceKernelTestBase {
     $this->assertEquals('commerce_mail', $email['id']);
     $this->assertEquals($this->user->getEmail(), $email['to']);
     $this->assertFalse(isset($email['headers']['Bcc']));
-    $this->assertEquals($this->store->getEmail(), $email['from']);
+    $this->assertEquals($this->store->label() . '<' . $this->store->getEmail() . '>', $email['from']);
     $this->assertEquals('Hello, customer!', $email['subject']);
     $this->assertNotContains('Commerce test theme', $email['body']);
   }