diff --git a/package.json b/package.json
index a2ef3c19..75b7e6ab 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/plugins/inputs/msg.js b/src/plugins/inputs/msg.js
index ecb979a4..6e0bfe26 100644
--- a/src/plugins/inputs/msg.js
+++ b/src/plugins/inputs/msg.js
@@ -5,14 +5,11 @@ module.exports = function(network, chan, cmd, args) {
 	if (cmd != "say" && cmd != "msg") {
 		return;
 	}
-	
 	if (args.length === 0 || args[0] === "") {
 		return;
 	}
-
 	var client = this;
 	var irc = network.irc;
-	
 	var target = "";
 	if (cmd == "msg") {
 		target = args.shift();
@@ -22,10 +19,8 @@ module.exports = function(network, chan, cmd, args) {
 	} else {
 		target = chan.name;
 	}
-	
 	var text = args.join(" ");
 	irc.send(target, text);
-	
 	if (target == chan.name && typeof chan !== "undefined") {
 		irc.emit("message", {
 			from: irc.me,
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index dc9d86f4..bdbb9375 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -6,7 +6,10 @@ module.exports = function(irc, network) {
 	var client = this;
 	irc.on("message", function(data) {
 		var target = data.to;
-		var chan = _.findWhere(network.channels, {name: target.charAt(0) == "#" ? target : data.from});
+		if (target == irc.me) {
+			target = data.from;
+		}
+		var chan = _.findWhere(network.channels, {name: target});
 		if (typeof chan === "undefined") {
 			chan = new Chan({
 				type: Chan.Type.QUERY,