diff --git a/docs/docs_message.rst b/docs/docs_message.rst
index 93d3c5776..9ec20c88d 100644
--- a/docs/docs_message.rst
+++ b/docs/docs_message.rst
@@ -15,7 +15,12 @@ Attributes
 channel
 ~~~~~~~
 
-The channel the message sent in, either a TextChannel_ or PMChannel_.
+The channel the message was sent in, either a TextChannel_ or PMChannel_.
+
+server
+~~~~~~~
+
+The Server_ the message was sent in. Will be null if the message was sent in a PMChannel_.
 
 client
 ~~~~~~
diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js
index 31e0055b8..9d9cf925a 100644
--- a/lib/Structures/Message.js
+++ b/lib/Structures/Message.js
@@ -40,6 +40,7 @@ var Message = (function (_Equality) {
 
 		_Equality.call(this);
 		this.channel = channel;
+		this.server = channel.server;
 		this.client = client;
 		this.nonce = data.nonce;
 		this.attachments = data.attachments;
diff --git a/src/Structures/Message.js b/src/Structures/Message.js
index 28ebb54f5..c777714e0 100644
--- a/src/Structures/Message.js
+++ b/src/Structures/Message.js
@@ -15,6 +15,7 @@ export default class Message extends Equality{
 	constructor(data, channel, client) {
 		super();
 		this.channel = channel;
+		this.server = channel.server;
 		this.client = client;
 		this.nonce = data.nonce;
 		this.attachments = data.attachments;