diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js
index a5deeb061..fdbe77d4c 100644
--- a/lib/Structures/Message.js
+++ b/lib/Structures/Message.js
@@ -63,9 +63,8 @@ var Message = (function (_Equality) {
 			this.author = client.internal.users.add(new _User2["default"](data.author, client));
 		}
 
-		if (this.type === 0) {
-			this.content = data.content;
-		} else if (this.type === 1) {
+		this.content = data.content;
+		if (!this.type) {} else if (this.type === 1) {
 			this.content = this.author.mention() + " added <@" + data.mentions[0].id + ">.";
 		} else if (this.type === 2) {
 			if (this.author.id === data.mentions[0].id) {
diff --git a/src/Structures/Message.js b/src/Structures/Message.js
index e77c1606e..78cafd354 100644
--- a/src/Structures/Message.js
+++ b/src/Structures/Message.js
@@ -38,8 +38,8 @@ export default class Message extends Equality{
 			this.author = client.internal.users.add(new User(data.author, client));
 		}
 
-		if(this.type === 0) {
-			this.content = data.content;
+		this.content = data.content;
+		if(!this.type) {
 		} else if(this.type === 1) {
 			this.content = this.author.mention() + " added <@" + data.mentions[0].id + ">.";
 		} else if(this.type === 2) {