From 077003ea1ecb293f4d5c11ac2d3f96b4fd754d23 Mon Sep 17 00:00:00 2001
From: Nikita Fedyashev <nfedyashev@gmail.com>
Date: Mon, 14 Jun 2021 01:09:16 +0300
Subject: [PATCH 1/2] Add missing DOM ids to rails/mailers/email.html template

---
 .../rails/templates/rails/mailers/email.html.erb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/railties/lib/rails/templates/rails/mailers/email.html.erb b/railties/lib/rails/templates/rails/mailers/email.html.erb
index f093d2930d..231db0ab5f 100644
--- a/railties/lib/rails/templates/rails/mailers/email.html.erb
+++ b/railties/lib/rails/templates/rails/mailers/email.html.erb
@@ -56,35 +56,35 @@
   <dl>
     <% if @email.respond_to?(:smtp_envelope_from) && Array(@email.from) != Array(@email.smtp_envelope_from) %>
       <dt>SMTP-From:</dt>
-      <dd><%= @email.smtp_envelope_from %></dd>
+      <dd id="smtp-from"><%= @email.smtp_envelope_from %></dd>
     <% end %>
 
     <% if @email.respond_to?(:smtp_envelope_to) && @email.to != @email.smtp_envelope_to %>
       <dt>SMTP-To:</dt>
-      <dd><%= @email.smtp_envelope_to %></dd>
+      <dd id="smtp-to"><%= @email.smtp_envelope_to %></dd>
     <% end %>
 
     <dt>From:</dt>
-    <dd><%= @email.header['from'] %></dd>
+    <dd id="from"><%= @email.header['from'] %></dd>
 
     <% if @email.reply_to %>
       <dt>Reply-To:</dt>
-      <dd><%= @email.header['reply-to'] %></dd>
+      <dd id="reply_to"><%= @email.header['reply-to'] %></dd>
     <% end %>
 
     <dt>To:</dt>
-    <dd><%= @email.header['to'] %></dd>
+    <dd id="to"><%= @email.header['to'] %></dd>
 
     <% if @email.cc %>
       <dt>CC:</dt>
-      <dd><%= @email.header['cc'] %></dd>
+      <dd id="cc"><%= @email.header['cc'] %></dd>
     <% end %>
 
     <dt>Date:</dt>
-    <dd><%= Time.current.rfc2822 %></dd>
+    <dd id="date"><%= Time.current.rfc2822 %></dd>
 
     <dt>Subject:</dt>
-    <dd><strong><%= @email.subject %></strong></dd>
+    <dd><strong id="subject"><%= @email.subject %></strong></dd>
 
     <% unless @email.attachments.nil? || @email.attachments.empty? %>
       <dt>Attachments:</dt>

From abacb36f0efe356cc7254e5c44785e4c709f2891 Mon Sep 17 00:00:00 2001
From: Nikita Fedyashev <nfedyashev@gmail.com>
Date: Tue, 15 Jun 2021 21:05:54 +0300
Subject: [PATCH 2/2] Downcase id attribute values

---
 railties/lib/rails/templates/rails/mailers/email.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/templates/rails/mailers/email.html.erb b/railties/lib/rails/templates/rails/mailers/email.html.erb
index 231db0ab5f..be7bedb756 100644
--- a/railties/lib/rails/templates/rails/mailers/email.html.erb
+++ b/railties/lib/rails/templates/rails/mailers/email.html.erb
@@ -56,12 +56,12 @@
   <dl>
     <% if @email.respond_to?(:smtp_envelope_from) && Array(@email.from) != Array(@email.smtp_envelope_from) %>
       <dt>SMTP-From:</dt>
-      <dd id="smtp-from"><%= @email.smtp_envelope_from %></dd>
+      <dd id="smtp_from"><%= @email.smtp_envelope_from %></dd>
     <% end %>
 
     <% if @email.respond_to?(:smtp_envelope_to) && @email.to != @email.smtp_envelope_to %>
       <dt>SMTP-To:</dt>
-      <dd id="smtp-to"><%= @email.smtp_envelope_to %></dd>
+      <dd id="smtp_to"><%= @email.smtp_envelope_to %></dd>
     <% end %>
 
     <dt>From:</dt>