diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 6c1b8f905..c63161866 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -495,7 +495,10 @@ var InternalClient = (function () {
 		return this.resolver.resolveChannel(where).then(function (destination) {
 			//var destination;
 			var content = _this10.resolver.resolveString(_content);
-			var mentions = _this10.resolver.resolveMentions(content);
+			var resolved = _this10.resolver.resolveMentions(content);
+
+			var mentions = resolved[0],
+			    content = resolved[1];
 
 			return _this10.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(destination.id), true, {
 				content: content,
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index a94e6d4c3..de62457b9 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -125,6 +125,7 @@ var Resolver = (function () {
 	Resolver.prototype.resolveMentions = function resolveMentions(resource) {
 		// resource is a string
 		var _mentions = [];
+		var changed = resource;
 		for (var _iterator = resource.match(/<@[^>]*>/g) || [], _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
 			var _ref;
 
@@ -139,9 +140,12 @@ var Resolver = (function () {
 
 			var mention = _ref;
 
-			_mentions.push(mention.substring(2, mention.length - 1));
+			var userID = mention.substring(2, mention.length - 1);
+			_mentions.push(userID);
+			changed = changed.replace(new RegExp(mention, "g"), "@" + this.internal.client.users.get("id", userID).username);
 		}
-		return _mentions;
+		console.log(changed);
+		return [_mentions, changed];
 	};
 
 	Resolver.prototype.resolveString = function resolveString(resource) {
diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js
index 3d95028b7..386d62ef5 100644
--- a/lib/Voice/VoiceConnection.js
+++ b/lib/Voice/VoiceConnection.js
@@ -290,9 +290,10 @@ var VoiceConnection = (function (_EventEmitter) {
 		var _this3 = this;
 
 		var self = this;
+		console.log("\n\nendpoint:", this.endpoint, "\n\n");
 		_dns2["default"].lookup(this.endpoint, function (err, address, family) {
-			_this3.endpoint = address;
 			var vWS = self.vWS = new _ws2["default"]("wss://" + _this3.endpoint, null, { rejectUnauthorized: false });
+			_this3.endpoint = address;
 			var udpClient = self.udp = _dgram2["default"].createSocket("udp4");
 
 			var firstPacket = true;
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index d45ca60c2..c0279294f 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -393,7 +393,9 @@ export default class InternalClient {
 		.then(destination => {
 			//var destination;
 			var content = this.resolver.resolveString(_content);
-			var mentions = this.resolver.resolveMentions(content);
+			var resolved = this.resolver.resolveMentions(content);
+
+			var mentions = resolved[0], content = resolved[1];
 
 			return this.apiRequest("post", Endpoints.CHANNEL_MESSAGES(destination.id), true, {
 				content: content,
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index d7c4467c2..2d8032ed0 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -84,10 +84,13 @@ export default class Resolver {
 	resolveMentions(resource) {
 		// resource is a string
 		var _mentions = [];
+		var changed = resource;
 		for (var mention of (resource.match(/<@[^>]*>/g) || [])) {
-			_mentions.push(mention.substring(2, mention.length - 1));
+			let userID = mention.substring(2, mention.length - 1);
+			_mentions.push(userID);
+			changed = changed.replace(new RegExp(mention, "g"), `@${this.internal.client.users.get("id", userID).username}`);
 		}
-		return _mentions;
+		return [_mentions, changed];
 	}
 
 	resolveString(resource) {
diff --git a/src/Voice/VoiceConnection.js b/src/Voice/VoiceConnection.js
index 556fff9fc..24afa722d 100644
--- a/src/Voice/VoiceConnection.js
+++ b/src/Voice/VoiceConnection.js
@@ -256,9 +256,10 @@ export default class VoiceConnection extends EventEmitter {
 
 	init() {
 		var self = this;
+		console.log("\n\nendpoint:", this.endpoint, "\n\n");
 		dns.lookup(this.endpoint, (err, address, family) => {
-			this.endpoint = address;
 			var vWS = self.vWS = new WebSocket("wss://" + this.endpoint, null, { rejectUnauthorized: false });
+			this.endpoint = address;
 			var udpClient = self.udp = udp.createSocket("udp4");
 
 			var firstPacket = true;
diff --git a/test/msgbot.js b/test/msgbot.js
index 0cf028d46..405446db4 100644
--- a/test/msgbot.js
+++ b/test/msgbot.js
@@ -26,6 +26,10 @@ client.on("message", msg => {
 		client.destroy();
 	}
 
+	if(msg.content === "replyme"){
+		msg.reply("hi");
+	}
+
 	if (msg.content === "$perms") {
 		msg.reply(client.channels.get("id", msg.channel.id));
 	}