diff --git a/DiscordChatExporter/DiscordChatExporter.csproj b/DiscordChatExporter/DiscordChatExporter.csproj
index 724651e..b206f0a 100644
--- a/DiscordChatExporter/DiscordChatExporter.csproj
+++ b/DiscordChatExporter/DiscordChatExporter.csproj
@@ -92,6 +92,7 @@
     <Compile Include="Models\ChannelType.cs" />
     <Compile Include="Models\ExportFormat.cs" />
     <Compile Include="Models\Extensions.cs" />
+    <Compile Include="Models\MessageType.cs" />
     <Compile Include="Services\IMessageGroupService.cs" />
     <Compile Include="Services\MessageGroupService.cs" />
     <Compile Include="ViewModels\ErrorViewModel.cs" />
diff --git a/DiscordChatExporter/Models/MessageType.cs b/DiscordChatExporter/Models/MessageType.cs
new file mode 100644
index 0000000..8ad4490
--- /dev/null
+++ b/DiscordChatExporter/Models/MessageType.cs
@@ -0,0 +1,14 @@
+namespace DiscordChatExporter.Models
+{
+    public enum MessageType
+    {
+        Default,
+        RecipientAdd,
+        RecipientRemove,
+        Call,
+        ChannelNameChange,
+        ChannelIconChange,
+        ChannelPinnedMessage,
+        GuildMemberJoin
+    }
+}
\ No newline at end of file
diff --git a/DiscordChatExporter/Services/DataService.cs b/DiscordChatExporter/Services/DataService.cs
index c72a9d9..711b3bf 100644
--- a/DiscordChatExporter/Services/DataService.cs
+++ b/DiscordChatExporter/Services/DataService.cs
@@ -188,10 +188,23 @@ namespace DiscordChatExporter.Services
             var timeStamp = token.Value<DateTime>("timestamp");
             var editedTimeStamp = token.Value<DateTime?>("edited_timestamp");
             var content = token.Value<string>("content");
-
-            // Lazy workaround for calls
-            if (token["call"] != null)
+            var type = (MessageType) token.Value<int>("type");
+
+            // Workarounds for non-default types
+            if (type == MessageType.RecipientAdd)
+                content = "Added a recipient.";
+            else if (type == MessageType.RecipientRemove)
+                content = "Removed a recipient.";
+            else if (type == MessageType.Call)
                 content = "Started a call.";
+            else if (type == MessageType.ChannelNameChange)
+                content = "Changed the channel name.";
+            else if (type == MessageType.ChannelIconChange)
+                content = "Changed the channel icon.";
+            else if (type == MessageType.ChannelPinnedMessage)
+                content = "Pinned a message.";
+            else if (type == MessageType.GuildMemberJoin)
+                content = "Joined the server.";
 
             // Get author
             var author = ParseUser(token["author"]);