diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv b/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
index aa830f9f..4dc536f3 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv
@@ -1,10 +1,9 @@
 Author;Date;Content;Attachments;
-
-{{- for group in MessageGroups -}}
+{{~ for group in MessageGroups -}}
   {{- for message in group.Messages -}}
     {{- message.Author.FullName }};
 
-    {{- message.TimeStamp | FormatDate }};
+    {{- message.Timestamp | FormatDate }};
 
     {{- message.Content | FormatContent }};
 
diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt b/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt
index c1342b81..d5c729a0 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt
@@ -7,7 +7,7 @@ Range:    {{ if From }}{{ From | FormatDate }} {{ end }}{{ if From || To }}->{{
 ==============================================================
 
 {{~ for group in MessageGroups ~}}
-  {{~ group.Author.FullName }} [{{ group.TimeStamp | FormatDate }}]
+  {{~ group.Author.FullName }} [{{ group.Timestamp | FormatDate }}]
   {{~ for message in group.Messages ~}}
     {{~ message.Content | FormatContent }}
     {{~ for attachment in message.Attachments ~}}