only in patch2:
unchanged:
--- a/config/install/webform.webform.contact.yml
+++ b/config/install/webform.webform.contact.yml
@@ -239,7 +239,7 @@ handlers:
     handler_id: email_notification
     status: true
     conditions: {  }
-    weight: 1
+    weight: 2
     settings:
       states:
         - completed
only in patch2:
unchanged:
--- a/modules/webform_templates/config/install/webform.webform.template_contact.yml
+++ b/modules/webform_templates/config/install/webform.webform.template_contact.yml
@@ -235,7 +235,7 @@ handlers:
     handler_id: email_notification
     status: true
     conditions: {  }
-    weight: 1
+    weight: 2
     settings:
       states:
         - completed
only in patch2:
unchanged:
--- a/modules/webform_templates/config/install/webform.webform.template_feedback.yml
+++ b/modules/webform_templates/config/install/webform.webform.template_feedback.yml
@@ -240,7 +240,7 @@ handlers:
     handler_id: email_notification
     status: true
     conditions: {  }
-    weight: 1
+    weight: 2
     settings:
       states:
         - completed
only in patch2:
unchanged:
--- a/src/Tests/Handler/WebformHandlerEmailRenderingTest.php
+++ b/src/Tests/Handler/WebformHandlerEmailRenderingTest.php
@@ -52,9 +52,13 @@ class WebformHandlerEmailRenderingTest extends WebformTestBase {
     // Check submitting contact form and sending emails using the
     // default bartik.theme.
     $sent_emails = $this->drupalGetMails();
+
+    $this->assertEqual('webform_contact_email_confirmation', $sent_emails[0]['id']);
     $this->assertContains('HEADER 1 (CONTACT_EMAIL_CONFIRMATION)', $sent_emails[0]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[0]['body']);
     $this->assertContains('address (contact_email_confirmation)', $sent_emails[0]['body']);
+
+    $this->assertEqual('webform_contact_email_notification', $sent_emails[1]['id']);
     $this->assertContains('HEADER 1 (GLOBAL)', $sent_emails[1]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[1]['body']);
     $this->assertContains('address (global)', $sent_emails[1]['body']);
@@ -77,9 +81,13 @@ class WebformHandlerEmailRenderingTest extends WebformTestBase {
     // bartik.theme.
     // @see \Drupal\webform\Plugin\WebformHandler\EmailWebformHandler::getMessage
     $sent_emails = $this->drupalGetMails();
+
+    $this->assertEqual('webform_contact_email_confirmation', $sent_emails[2]['id']);
     $this->assertContains('HEADER 1 (CONTACT_EMAIL_CONFIRMATION)', $sent_emails[2]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[2]['body']);
     $this->assertContains('address (contact_email_confirmation)', $sent_emails[2]['body']);
+
+    $this->assertEqual('webform_contact_email_notification', $sent_emails[3]['id']);
     $this->assertContains('HEADER 1 (GLOBAL)', $sent_emails[3]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[3]['body']);
     $this->assertContains('address (global)', $sent_emails[3]['body']);