diff --git a/DiscordChatExporter.Core/Discord/Data/Message.cs b/DiscordChatExporter.Core/Discord/Data/Message.cs
index 2c570591..00d9432e 100644
--- a/DiscordChatExporter.Core/Discord/Data/Message.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Message.cs
@@ -36,12 +36,12 @@ public partial record Message(
 
     public bool IsReply { get; } = Kind == MessageKind.Reply;
 
-    // A message is a forward if its reference type is Forward
-    public bool IsForward { get; } = Reference?.Kind == MessageReferenceKind.Forward;
-
     // App interactions are rendered as replies in the Discord client, but they are not actually replies
     public bool IsReplyLike => IsReply || Interaction is not null;
 
+    // A message is a forward if its reference type is Forward
+    public bool IsForward { get; } = Reference?.Kind == MessageReferenceKind.Forward;
+
     public bool IsEmpty { get; } =
         string.IsNullOrWhiteSpace(Content)
         && !Attachments.Any()
diff --git a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
index 8d56e251..d12d42c3 100644
--- a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
+++ b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
@@ -263,7 +263,7 @@
                     }
 
                     @* Forwarded message content *@
-                    @if (message.IsForward && message.ForwardedMessage is not null)
+                    @if (message.IsForwarded && message.ForwardedMessage is not null)
                     {
                         var fwd = message.ForwardedMessage;
                         <div class="chatlog__forwarded">