diff --git a/package.json b/package.json
index eec6f481..1b86ce48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/plugins/inputs/msg.js b/src/plugins/inputs/msg.js
index 9606cdc9..ecb979a4 100644
--- a/src/plugins/inputs/msg.js
+++ b/src/plugins/inputs/msg.js
@@ -27,15 +27,10 @@ module.exports = function(network, chan, cmd, args) {
 	irc.send(target, text);
 	
 	if (target == chan.name && typeof chan !== "undefined") {
-		var msg = new Msg({
-			type: Msg.Type.MESSAGE,
+		irc.emit("message", {
 			from: irc.me,
-			text: text
-		});
-		chan.messages.push(msg);
-		client.emit("msg", {
-			chan: chan.id,
-			msg: msg
+			to: chan.name,
+			message: text
 		});
 	}
 };