From 7067b82e0617d2fd8f3b26a121a4c5c872acd1eb Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Thu, 21 Mar 2019 10:44:14 +0100
Subject: [PATCH] Improve message handling

[MAILPOET-1890]
---
 assets/js/src/common/sender_email_address_warning.jsx | 4 ++--
 views/layout.html                                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx
index 7983862cd8..26dbfef608 100644
--- a/assets/js/src/common/sender_email_address_warning.jsx
+++ b/assets/js/src/common/sender_email_address_warning.jsx
@@ -12,14 +12,14 @@ const NewInstallationWithMSSWarning = ({ emailAddress }) => (
     <p className="sender_email_address_warning">
       {ReactStringReplace(
         MailPoet.I18n.t('senderEmailAddressNewInstallWarning1'),
-        /<em>%originalSender<\/em>/,
+        '%originalSender',
         () => <em key="reply-to">{ emailAddress }</em>
       )}
     </p>
     <p className="sender_email_address_warning">
       {ReactStringReplace(
         MailPoet.I18n.t('senderEmailAddressNewInstallWarning2'),
-        /(<em>%suggested<\/em>|<em>%originalSender<\/em>)/,
+        /(%suggested|%originalSender)/,
         (match) => {
           if (match === '<em>%suggested</em>') return <em key="suggested-email">{ suggestedEmailAddress }</em>;
           return <em key="sender-email">{ emailAddress }</em>;
diff --git a/views/layout.html b/views/layout.html
index 9961d8ebd5..c0fd8b3fcd 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -70,8 +70,8 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
   'senderEmailAddressWarning2': _x('Use an address like %suggested for the Sender and put %originalSender in the <em>Reply-to</em> field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
   'senderEmailAddressWarning3': _x('Read more.'),
 
-  'senderEmailAddressNewInstallWarning1': __('The MailPoet Sending Service can’t send email with the email address <em>%originalSender</em>.'),
-  'senderEmailAddressNewInstallWarning2': __('You have to use an address like <em>%suggested</em> and put <em>%originalSender</em>‌‌‌‌ in the Reply-to field below.'),
+  'senderEmailAddressNewInstallWarning1': __('The MailPoet Sending Service can’t send email with the email address %originalSender.'),
+  'senderEmailAddressNewInstallWarning2': __('You have to use an address like %suggested and put %originalSender‌‌‌‌ in the Reply-to field below.'),
   'senderEmailAddressNewInstallWarning3': __('This new email address has to be authorized first in your account.'),
   'senderEmailAddressNewInstallWarning4': __('Authorize your email.'),
 }) %>