diff --git a/src/formulate.app/Forms/Handlers/Email/EmailHandler.cs b/src/formulate.app/Forms/Handlers/Email/EmailHandler.cs
index 8a78f2c0..6e55c5b9 100644
--- a/src/formulate.app/Forms/Handlers/Email/EmailHandler.cs
+++ b/src/formulate.app/Forms/Handlers/Email/EmailHandler.cs
@@ -60,10 +60,13 @@ public class EmailHandler : IFormHandlerType
         public EmailHandler(IConfigurationManager configurationManager)
         {
             Config = configurationManager;
+            var options = RegexOptions.Compiled;
+            LineBreakRegex = new Regex(@"\r\n|\r(?!\n)|(?<!\r)\n", options);
         }
 
         #endregion
 
+
         #region Public Properties
 
         /// <summary>
@@ -88,6 +91,7 @@ public EmailHandler(IConfigurationManager configurationManager)
 
         #endregion
 
+
         #region Private Properties
 
         /// <summary>
@@ -96,9 +100,9 @@ public EmailHandler(IConfigurationManager configurationManager)
         private IConfigurationManager Config { get; set; }
 
         /// <summary>
-        /// Precompiled regex for finding line breaks.
+        /// Matches line breaks.
         /// </summary>
-        private static Regex LineBreakRegex = new Regex(@"(\r\n|\r(?!\n)|(?<!\r)\n)", RegexOptions.Compiled);
+        private static Regex LineBreakRegex { get; set; }
 
         #endregion
 
@@ -458,9 +462,10 @@ private string ConstructMessage(
             if (isHtml)
             {
                 baseMessage = WebUtility.HtmlEncode(baseMessage);
-
-                lines = lines.Select(x => LineBreakRegex.Replace(WebUtility.HtmlEncode(x),
-                  Environment.NewLine + "<br>" + Environment.NewLine)).ToList();
+                lines = lines
+                    .Select(x => WebUtility.HtmlEncode(x))
+                    .Select(x => LineBreakRegex.Replace(x, nl))
+                    .ToList();
             }
 
             // Return message.
@@ -555,4 +560,4 @@ private object AttemptGetValue(Dictionary<string, object> dictionary, string key
 
         #endregion
     }
-}
+}
\ No newline at end of file