diff --git a/src/org/yaaic/command/handler/EchoHandler.java b/src/org/yaaic/command/handler/EchoHandler.java
index aa37875..6348050 100644
--- a/src/org/yaaic/command/handler/EchoHandler.java
+++ b/src/org/yaaic/command/handler/EchoHandler.java
@@ -49,7 +49,7 @@ public class EchoHandler extends BaseHandler
 			conversation.addMessage(message);
 			
 			Intent intent = Broadcast.createConversationIntent(
-				Broadcast.CONVERSATION_REMOVE,
+				Broadcast.CONVERSATION_MESSAGE,
 				server.getId(),
 				conversation.getName()
 			);
diff --git a/src/org/yaaic/command/handler/MeHandler.java b/src/org/yaaic/command/handler/MeHandler.java
index fb54e39..1ff5502 100644
--- a/src/org/yaaic/command/handler/MeHandler.java
+++ b/src/org/yaaic/command/handler/MeHandler.java
@@ -59,7 +59,7 @@ public class MeHandler extends BaseHandler
 			server.getConversation(conversation.getName()).addMessage(message);
 			
 			Intent intent = Broadcast.createConversationIntent(
-				Broadcast.CONVERSATION_REMOVE,
+				Broadcast.CONVERSATION_MESSAGE,
 				server.getId(),
 				conversation.getName()
 			);
diff --git a/src/org/yaaic/command/handler/NamesHandler.java b/src/org/yaaic/command/handler/NamesHandler.java
index bc7af8d..2a82335 100644
--- a/src/org/yaaic/command/handler/NamesHandler.java
+++ b/src/org/yaaic/command/handler/NamesHandler.java
@@ -63,7 +63,7 @@ public class NamesHandler extends BaseHandler
 		conversation.addMessage(message);
 		
 		Intent intent = Broadcast.createConversationIntent(
-			Broadcast.CONVERSATION_REMOVE,
+			Broadcast.CONVERSATION_MESSAGE,
 			server.getId(),
 			conversation.getName()
 		);
diff --git a/src/org/yaaic/command/handler/NoticeHandler.java b/src/org/yaaic/command/handler/NoticeHandler.java
index aae3c8f..cc88c14 100644
--- a/src/org/yaaic/command/handler/NoticeHandler.java
+++ b/src/org/yaaic/command/handler/NoticeHandler.java
@@ -56,7 +56,7 @@ public class NoticeHandler extends BaseHandler
 			conversation.addMessage(message);
 			
 			Intent intent = Broadcast.createConversationIntent(
-				Broadcast.CONVERSATION_REMOVE,
+				Broadcast.CONVERSATION_MESSAGE,
 				server.getId(),
 				conversation.getName()
 			);
diff --git a/src/org/yaaic/command/handler/QueryHandler.java b/src/org/yaaic/command/handler/QueryHandler.java
index 1d654df..787f5eb 100644
--- a/src/org/yaaic/command/handler/QueryHandler.java
+++ b/src/org/yaaic/command/handler/QueryHandler.java
@@ -62,7 +62,7 @@ public class QueryHandler extends BaseHandler
 			server.addConversationl(new Query(params[1]));
 			
 			Intent intent = Broadcast.createConversationIntent(
-				Broadcast.CONVERSATION_REMOVE,
+				Broadcast.CONVERSATION_MESSAGE,
 				server.getId(),
 				conversation.getName()
 			);
diff --git a/src/org/yaaic/irc/IRCBinder.java b/src/org/yaaic/irc/IRCBinder.java
index b519bac..d8feead 100644
--- a/src/org/yaaic/irc/IRCBinder.java
+++ b/src/org/yaaic/irc/IRCBinder.java
@@ -105,7 +105,7 @@ public class IRCBinder extends Binder
 					server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
 					
 					Intent cIntent = Broadcast.createConversationIntent(
-						Extra.CONVERSATION,
+						Broadcast.CONVERSATION_MESSAGE,
 						server.getId(),
 						ServerInfo.DEFAULT_NAME
 					);