diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv b/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
index 7de5e5c..7643ad2 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
@@ -1,10 +1,10 @@
 Author;Date;Content;Attachments;
 {{~ for message in Model.Messages -}}
-  {{- message.Author.FullName }};
+  {{- }}"{{ message.Author.FullName }}";
 
-  {{- message.Timestamp | FormatDate }};
+  {{- }}"{{ message.Timestamp | FormatDate }}";
 
-  {{- message.Content | FormatContent }};
+  {{- }}"{{ message.Content | FormatContent }}";
 
-  {{- message.Attachments | array.map "Url" | array.join "," }};
+  {{- }}"{{ message.Attachments | array.map "Url" | array.join "," }}";
 {{~ end -}}
\ No newline at end of file
diff --git a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
index effe4fb..4a21bc9 100644
--- a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
+++ b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
@@ -273,9 +273,6 @@ namespace DiscordChatExporter.Core.Services
 
             private string FormatContentCsv(string content)
             {
-                // New lines
-                content = content.Replace("\n", ", ");
-
                 // Escape quotes
                 content = content.Replace("\"", "\"\"");