diff --git a/Wino.Core/Services/MailService.cs b/Wino.Core/Services/MailService.cs
index 5a9e9123..5f023850 100644
--- a/Wino.Core/Services/MailService.cs
+++ b/Wino.Core/Services/MailService.cs
@@ -769,7 +769,9 @@ namespace Wino.Core.Services
if (draftCreationOptions.MailToUri.Body != null)
{
- builder.HtmlBody = $"""
{draftCreationOptions.MailToUri.Body}
""" + builder.HtmlBody;
+ // TODO: In .NET 6+ replace with string "ReplaceLineEndings" method.
+ var escapedBody = draftCreationOptions.MailToUri.Body.Replace("\r\n", "
").Replace("\n", "
").Replace("\r", "
");
+ builder.HtmlBody = $"""{escapedBody}
""" + builder.HtmlBody;
}
if (draftCreationOptions.MailToUri.To.Any())