diff --git a/app/serializers/admin_email_template_serializer.rb b/app/serializers/admin_email_template_serializer.rb
index 05779d3e237..0a670091ed9 100644
--- a/app/serializers/admin_email_template_serializer.rb
+++ b/app/serializers/admin_email_template_serializer.rb
@@ -6,7 +6,11 @@ class AdminEmailTemplateSerializer < ApplicationSerializer
   end
 
   def title
-    object.gsub(/.*\./, '').titleize
+    if I18n.exists?("#{object}.title")
+      I18n.t("#{object}.title")
+    else
+      object.gsub(/.*\./, '').titleize
+    end
   end
 
   def subject
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 85c5913f0a1..a7a4c8afdbd 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1642,6 +1642,7 @@ en:
       other: "%{count} flags waiting to be handled"
 
   unsubscribe_mailer:
+    title: "Unsubscribe Mailer"
     subject_template: "Confirm you no longer want to receive email updates from %{site_title}"
     text_body_template: |
       Someone (possibly you?) requested to no longer send email updates from %{site_domain_name} to this address.
@@ -1653,6 +1654,7 @@ en:
       If you want to continue receiving email updates, you may ignore this email.
 
   invite_mailer:
+    title: "Invite Mailer"
     subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
       %{invitee_name} invited you to a discussion
@@ -1672,6 +1674,7 @@ en:
       This invitation is from a trusted user, so you can reply to the discussion immediately.
 
   custom_invite_mailer:
+    title: "Custom Invite Mailer"
     subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
       %{invitee_name} invited you to a discussion
@@ -1695,6 +1698,7 @@ en:
       This invitation is from a trusted user, so you can reply to the discussion immediately.
 
   invite_forum_mailer:
+    title: "Invite Forum Mailer"
     subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
     text_body_template: |
       %{invitee_name} invited you to join
@@ -1710,6 +1714,7 @@ en:
       This invitation is from a trusted user, so an account will be created for you automatically.
 
   custom_invite_forum_mailer:
+    title: "Invite Forum Mailer"
     subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
     text_body_template: |
       %{invitee_name} invited you to join
@@ -1729,6 +1734,7 @@ en:
       This invitation is from a trusted user, so an account will be created for you automatically.
 
   invite_password_instructions:
+    title: "Invite Password Instructions"
     subject_template: "Set password for your %{site_name} account"
     text_body_template: |
       Thanks for accepting your invitation to %{site_name} -- welcome!
@@ -1739,6 +1745,7 @@ en:
       (If the link above has expired, choose "I forgot my password" when logging in with your email address.)
 
   test_mailer:
+    title: "Test Mailer"
     subject_template: "[%{site_name}] Email Deliverability Test"
     text_body_template: |
       This is a test email from
@@ -1783,6 +1790,7 @@ en:
       [mt]: http://www.mail-tester.com/
 
   new_version_mailer:
+    title: "New Version Mailer"
     subject_template: "[%{site_name}] New Discourse version, update available"
     text_body_template: |
       Hooray, a new version of [Discourse](http://www.discourse.org) is available!
@@ -1797,6 +1805,7 @@ en:
       - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
 
   new_version_mailer_with_notes:
+    title: "New Version Mailer with Notes"
     subject_template: "[%{site_name}] update available"
     text_body_template: |
       Hooray, a new version of [Discourse](http://www.discourse.org) is available!
@@ -1815,6 +1824,7 @@ en:
       %{notes}
 
   queued_posts_reminder:
+    title: "Queued Posts Reminder"
     subject_template:
       one: "[%{site_name}] 1 post waiting to be reviewed"
       other: "[%{site_name}] %{count} posts waiting to be reviewed"
@@ -1840,6 +1850,7 @@ en:
 
   system_messages:
     post_hidden:
+      title: "Post Hidden"
       subject_template: "Post hidden by community flags"
       text_body_template: |
         Hello,
@@ -1863,6 +1874,7 @@ en:
         As you participate here, we’ll get to know you, and temporary new user limitations will be lifted. Over time you’ll gain [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) that include special abilities to help us manage our community together.
 
     welcome_user:
+      title: "Welcome User"
       subject_template: "Welcome to %{site_name}!"
       text_body_template: |
         Thanks for joining %{site_name}, and welcome!
@@ -1876,6 +1888,7 @@ en:
         (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
 
     welcome_invite:
+      title: "Welcome Invite"
       subject_template: "Welcome to %{site_name}!"
       text_body_template: |
         Thanks for accepting your invitation to %{site_name} -- welcome!
@@ -1899,6 +1912,7 @@ en:
         [prefs]: %{user_preferences_url}
 
     backup_succeeded:
+      title: "Backup Succeeded"
       subject_template: "Backup completed successfully"
       text_body_template: |
         The backup was successful.
@@ -1912,6 +1926,7 @@ en:
         ```
 
     backup_failed:
+      title: "Backup Failed"
       subject_template: "Backup failed"
       text_body_template: |
         The backup has failed.
@@ -1923,6 +1938,7 @@ en:
         ```
 
     restore_succeeded:
+      title: "Restore Succeeded"
       subject_template: "Restore completed successfully"
       text_body_template: |
         The restore was successful.
@@ -1934,6 +1950,7 @@ en:
         ```
 
     restore_failed:
+      title: "Restore Failed"
       subject_template: "Restore failed"
       text_body_template: |
         The restore has failed.
@@ -1945,10 +1962,12 @@ en:
         ```
 
     bulk_invite_succeeded:
+      title: "Bulk Invite Succeeded"
       subject_template: "Bulk user invite processed successfully"
       text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
 
     bulk_invite_failed:
+      title: "Bulk Invite Failed"
       subject_template: "Bulk user invite processed with errors"
       text_body_template: |
         Your bulk user invite file was processed, %{sent} invites mailed with %{failed} error(s).
@@ -1960,6 +1979,7 @@ en:
         ```
 
     csv_export_succeeded:
+      title: "CSV Export Succeeded"
       subject_template: "Data export complete"
       text_body_template: |
         Your data export was successful! :dvd:
@@ -1969,10 +1989,12 @@ en:
         The above download link will be valid for 48 hours.
 
     csv_export_failed:
+      title: "CSV Export Failed"
       subject_template: "Data export failed"
       text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
 
     email_reject_insufficient_trust_level:
+      title: "Email Reject insufficient Trust Level"
       subject_template: "[%{site_name}] Email issue -- Insufficient Trust Level"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -1980,6 +2002,7 @@ en:
         Your account does not have the required trust level to post new topics to this email address. If you believe this is an error, contact a staff member.
 
     email_reject_user_not_found:
+      title: "Email Reject User Not Found"
       subject_template: "[%{site_name}] Email issue -- User Not Found"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -1987,6 +2010,7 @@ en:
         Your reply was sent from an unknown email address. Try sending from another email address, or contact a staff member.
 
     email_reject_screened_email:
+      title: "Email Reject Screened Email"
       subject_template: "[%{site_name}] Email issue -- Blocked Email"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -1994,6 +2018,7 @@ en:
         Your reply was sent from a blocked email address. Try sending from another email address, or contact a staff member.
 
     email_reject_inactive_user:
+      title: "Email Reject Inactive User"
       subject_template: "[%{site_name}] Email issue -- Inactive User"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2001,6 +2026,7 @@ en:
         Your account associated with this email address is not activated. Please activate your account before sending emails in.
 
     email_reject_blocked_user:
+      title: "Email Reject Blocked User"
       subject_template: "[%{site_name}] Email issue -- Blocked User"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2008,6 +2034,7 @@ en:
         Your account associated with this email address has been blocked.
 
     email_reject_reply_user_not_matching:
+      title: "Email Reject User Not Matching"
       subject_template: "[%{site_name}] Email issue -- Unexpected Reply Address"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2015,6 +2042,7 @@ en:
         Your reply was sent from a different email address than the one we expected, so we're not sure if this is the same person. Try sending from another email address, or contact a staff member.
 
     email_reject_no_account:
+      title: "Email Reject No Account"
       subject_template: "[%{site_name}] Email issue -- Unknown Account"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2022,6 +2050,7 @@ en:
         We can't find any accounts that match your email address. Try sending from a different email address, or contact a staff member.
 
     email_reject_empty:
+      title: "Email Reject Empty"
       subject_template: "[%{site_name}] Email issue -- No Content"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2031,6 +2060,7 @@ en:
         If you're getting this and you _did_ include a reply, try again with simpler formatting.
 
     email_reject_parsing:
+      title: "Email Reject Parsing"
       subject_template: "[%{site_name}] Email issue -- Content Unrecognized"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2038,6 +2068,7 @@ en:
         We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
 
     email_reject_invalid_access:
+      title: "Email Reject Invalid Access"
       subject_template: "[%{site_name}] Email issue -- Invalid Access"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2045,6 +2076,7 @@ en:
         Your account does not have the privileges to post new topics in that category. If you believe this is an error, contact a staff member.
 
     email_reject_strangers_not_allowed:
+      title: "Email Reject Strangers Not Allowed"
       subject_template: "[%{site_name}] Email issue -- Invalid Access"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2052,6 +2084,7 @@ en:
         The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, contact a staff member.
 
     email_reject_invalid_post:
+      title: "Email Reject Invalid Post"
       subject_template: "[%{site_name}] Email issue -- Posting error"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2059,6 +2092,7 @@ en:
         Some possible causes are: complex formatting, message too large, message too small. Please try again, or post via the website if this continues.
 
     email_reject_invalid_post_specified:
+      title: "Email Reject Invalid Post Specified"
       subject_template: "[%{site_name}] Email issue -- Posting error"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2070,6 +2104,7 @@ en:
         If you can correct the problem, please try again.
 
     email_reject_invalid_post_action:
+      title: "Email Reject Invalid Post Action"
       subject_template: "[%{site_name}] Email issue -- Invalid Post Action"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2078,6 +2113,7 @@ en:
 
 
     email_reject_reply_key:
+      title: "Email Reject Reply Key"
       subject_template: "[%{site_name}] Email issue -- Unknown Reply Key"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2085,6 +2121,7 @@ en:
         The reply key in the email is invalid or unknown, so we can't figure out what this email is in reply to. Contact a staff member.
 
     email_reject_bad_destination_address:
+      title: "Email Reject Bad Destination Address"
       subject_template: "[%{site_name}] Email issue -- Unknown To: Address"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2092,6 +2129,7 @@ en:
         None of the destination email addresses are recognized. Please make sure that you are sending to the correct email address provided by staff.
 
     email_reject_topic_not_found:
+      title: "Email Reject Topic Not Found"
       subject_template: "[%{site_name}] Email issue -- Topic Not Found"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2099,6 +2137,7 @@ en:
         The topic you are replying to no longer exists -- perhaps it was deleted? If you believe this is an error, contact a staff member.
 
     email_reject_topic_closed:
+      title: "Email Reject Topic Closed"
       subject_template: "[%{site_name}] Email issue -- Topic Closed"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2106,6 +2145,7 @@ en:
         The topic you are replying to is currently closed and no longer accepting replies. If you believe this is an error, contact a staff member.
 
     email_reject_auto_generated:
+      title: "Email Reject Auto Generated"
       subject_template: "[%{site_name}] Email issue -- Auto Generated Reply"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
@@ -2113,6 +2153,7 @@ en:
         Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, contact a staff member.
 
     email_error_notification:
+      title: "Email Error Notification"
       subject_template: "[%{site_name}] Email issue -- POP authentication error"
       text_body_template: |
         Unfortunately, there was an authentication error while polling mails from the POP server.
@@ -2121,6 +2162,7 @@ en:
 
         If there is a web UI for the POP email account, you may need to log in on the web and check your settings there.
     too_many_spam_flags:
+      title: "Too Many Spam Flags"
       subject_template: "New account on hold"
       text_body_template: |
         Hello,
@@ -2131,6 +2173,7 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     too_many_tl3_flags:
+      title: "Too Many TL3 Flags"
       subject_template: "New account on hold"
       text_body_template: |
         Hello,
@@ -2141,6 +2184,7 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     blocked_by_staff:
+      title: "Blocked by Staff"
       subject_template: "Account temporarily on hold"
       text_body_template: |
         Hello,
@@ -2152,6 +2196,7 @@ en:
         For additional guidance, refer to our [community guidelines](%{base_url}/guidelines).
 
     user_automatically_blocked:
+      title: "User Automatically Blocked"
       subject_template: "New user %{username} blocked by community flags"
       text_body_template: |
         This is an automated message.
@@ -2163,6 +2208,7 @@ en:
         This threshold can be changed via the `block_new_user` site settings.
 
     spam_post_blocked:
+      title: "Spam Post Blocked"
       subject_template: "New user %{username} posts blocked due to repeated links"
       text_body_template: |
         This is an automated message.
@@ -2174,6 +2220,7 @@ en:
         This can be modified via the `newuser_spam_host_threshold` and `white_listed_spam_host_domains` site settings.
 
     unblocked:
+      title: "Unblocked"
       subject_template: "Account no longer on hold"
       text_body_template: |
         Hello,
@@ -2183,6 +2230,7 @@ en:
         You can now create new replies and topics again. Thank you for your patience.
 
     pending_users_reminder:
+      title: "Pending Users Reminder"
       subject_template:
         one: "1 user waiting for approval"
         other: "%{count} users waiting for approval"
@@ -2192,10 +2240,12 @@ en:
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
 
     download_remote_images_disabled:
+      title: "Download Remote Images Disabled"
       subject_template: "Downloading remote images disabled"
       text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
 
     dashboard_problems:
+      title: "Dashboard Problems"
       subject_template: "Problems have been found"
       text_body_template: |
         Some problems are being reported on your admin dashboard.
@@ -2258,6 +2308,7 @@ en:
       > %{site_title} -- %{site_description}
 
     user_invited_to_private_message_pm:
+      title: "User Invited to PM"
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
@@ -2267,6 +2318,7 @@ en:
         %{respond_instructions}
 
     user_invited_to_private_message_pm_staged:
+      title: "User Invited to PM Staged"
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
@@ -2276,6 +2328,7 @@ en:
         %{respond_instructions}
 
     user_invited_to_topic:
+      title: "User Invited to Topic"
       subject_template: "[%{site_name}] %{username} invited you to '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
@@ -2285,6 +2338,7 @@ en:
         %{respond_instructions}
 
     user_replied:
+      title: "User Replied"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2296,6 +2350,7 @@ en:
         %{respond_instructions}
 
     user_replied_pm:
+      title: "User Replied PM"
       subject_template: "[%{site_name}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2307,6 +2362,7 @@ en:
         %{respond_instructions}
 
     user_quoted:
+      title: "User Quoted"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2318,6 +2374,7 @@ en:
         %{respond_instructions}
 
     user_linked:
+      title: "User Linked"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2329,6 +2386,7 @@ en:
         %{respond_instructions}
 
     user_mentioned:
+      title: "User Mentioned"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2340,6 +2398,7 @@ en:
         %{respond_instructions}
 
     user_group_mentioned:
+      title: "User Group Mentioned"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2351,6 +2410,7 @@ en:
         %{respond_instructions}
 
     user_posted:
+      title: "User Posted"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2362,6 +2422,7 @@ en:
         %{respond_instructions}
 
     user_watching_first_post:
+      title: "User Watching First Post"
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2373,6 +2434,7 @@ en:
         %{respond_instructions}
 
     user_posted_pm:
+      title: "User Posted PM"
       subject_template: "[%{site_name}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2384,6 +2446,7 @@ en:
         %{respond_instructions}
 
     user_posted_pm_staged:
+      title: "User Posted PM Staged"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |
 
@@ -2442,6 +2505,7 @@ en:
       view_this_topic: "View this topic"
       back_to_top: "Back to top"
     forgot_password:
+      title: "Forgot Password"
       subject_template: "[%{site_name}] Password reset"
       text_body_template: |
         Somebody asked to reset your password on [%{site_name}](%{base_url}).
@@ -2452,6 +2516,7 @@ en:
         %{base_url}/users/password-reset/%{email_token}
 
     set_password:
+      title: "Set Password"
       subject_template: "[%{site_name}] Set Password"
       text_body_template: |
         Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
@@ -2462,6 +2527,7 @@ en:
         %{base_url}/users/password-reset/%{email_token}
 
     admin_login:
+      title: "Admin Login"
       subject_template: "[%{site_name}] Login"
       text_body_template: |
         Somebody asked to login to your account on [%{site_name}](%{base_url}).
@@ -2472,6 +2538,7 @@ en:
         %{base_url}/users/admin-login/%{email_token}
 
     account_created:
+      title: "Account Created"
       subject_template: "[%{site_name}] Your New Account"
       text_body_template: |
         A new account was created for you at %{site_name}
@@ -2480,6 +2547,7 @@ en:
         %{base_url}/users/password-reset/%{email_token}
 
     confirm_new_email:
+      title: "Confirm New Email"
       subject_template: "[%{site_name}] Confirm your new email address"
       text_body_template: |
         Confirm your new email address for %{site_name} by clicking on the following link:
@@ -2487,6 +2555,7 @@ en:
         %{base_url}/users/authorize-email/%{email_token}
 
     confirm_old_email:
+      title: "Confirm Old Email"
       subject_template: "[%{site_name}] Confirm your current email address"
       text_body_template: |
         Before we can change your email address, we need you to confirm that you control
@@ -2498,6 +2567,7 @@ en:
         %{base_url}/users/authorize-email/%{email_token}
 
     notify_old_email:
+      title: "Notify Old Email"
       subject_template: "[%{site_name}] Your email address has been changed"
       text_body_template: |
         This is an automated message to let you know that your email address for
@@ -2509,6 +2579,7 @@ en:
         %{new_email}
 
     signup_after_approval:
+      title: "Signup After Approval"
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
         Welcome to %{site_name}!
@@ -2529,6 +2600,7 @@ en:
         (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
 
     signup:
+      title: "Signup"
       subject_template: "[%{site_name}] Confirm your new account"
       text_body_template: |
         Welcome to %{site_name}!