diff --git a/src/org/yaaic/irc/IRCConnection.java b/src/org/yaaic/irc/IRCConnection.java
index 602d1e7..56824d7 100644
--- a/src/org/yaaic/irc/IRCConnection.java
+++ b/src/org/yaaic/irc/IRCConnection.java
@@ -162,6 +162,9 @@ public class IRCConnection extends PircBot
 	protected void onMessage(String target, String sender, String login, String hostname, String message)
 	{
 		debug("Message", target + " " + sender + " " + message);
+
+		server.getChannel(target).addMessage("<" + sender + ">" + message);
+		service.sendBroadcast(new Intent(Broadcast.CHANNEL_MESSAGE));
 	}
 
 	/**