diff --git a/src/org/yaaic/command/CommandParser.java b/src/org/yaaic/command/CommandParser.java
index c994c3a..4e10fc4 100644
--- a/src/org/yaaic/command/CommandParser.java
+++ b/src/org/yaaic/command/CommandParser.java
@@ -143,9 +143,12 @@ public class CommandParser
 					Message usageMessage = new Message("Syntax: " + command.getUsage());
 					conversation.addMessage(usageMessage);
 					
-					Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-					intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-					intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+					Intent intent = Broadcast.createConversationIntent(
+						Broadcast.CONVERSATION_MESSAGE,
+						server.getId(),
+						conversation.getName()
+					);
+
 					service.sendBroadcast(intent);
 				}
 			}
@@ -162,9 +165,12 @@ public class CommandParser
 					message.setColor(Message.COLOR_RED);
 					conversation.addMessage(message);
 					
-					Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-					intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-					intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+					Intent intent = Broadcast.createConversationIntent(
+						Broadcast.CONVERSATION_MESSAGE,
+						server.getId(),
+						conversation.getName()
+					);
+					
 					service.sendBroadcast(intent);
 				}
 			}
diff --git a/src/org/yaaic/command/handler/CloseHandler.java b/src/org/yaaic/command/handler/CloseHandler.java
index 483efee..323fee7 100644
--- a/src/org/yaaic/command/handler/CloseHandler.java
+++ b/src/org/yaaic/command/handler/CloseHandler.java
@@ -55,9 +55,11 @@ public class CloseHandler extends BaseHandler
 			if (conversation.getType() == Conversation.TYPE_QUERY) {
 				server.removeConversation(conversation.getName());
 				
-				Intent intent = new Intent(Broadcast.CONVERSATION_REMOVE);
-				intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-				intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+				Intent intent = Broadcast.createConversationIntent(
+					Broadcast.CONVERSATION_REMOVE,
+					server.getId(),
+					conversation.getName()
+				);
 				service.sendBroadcast(intent);
 			}
 		}
diff --git a/src/org/yaaic/command/handler/EchoHandler.java b/src/org/yaaic/command/handler/EchoHandler.java
index da70a63..007a1c1 100644
--- a/src/org/yaaic/command/handler/EchoHandler.java
+++ b/src/org/yaaic/command/handler/EchoHandler.java
@@ -47,9 +47,11 @@ public class EchoHandler extends BaseHandler
 			Message message = new Message(BaseHandler.mergeParams(params));
 			conversation.addMessage(message);
 			
-			Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-			intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-			intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+			Intent intent = Broadcast.createConversationIntent(
+				Broadcast.CONVERSATION_REMOVE,
+				server.getId(),
+				conversation.getName()
+			);
 			service.sendBroadcast(intent);
 		} else {
 			throw new CommandException("Text is missing");
diff --git a/src/org/yaaic/command/handler/MeHandler.java b/src/org/yaaic/command/handler/MeHandler.java
index 6b1b914..2f1f5b4 100644
--- a/src/org/yaaic/command/handler/MeHandler.java
+++ b/src/org/yaaic/command/handler/MeHandler.java
@@ -56,9 +56,11 @@ public class MeHandler extends BaseHandler
 			message.setIcon(R.drawable.action);
 			server.getConversation(conversation.getName()).addMessage(message);
 			
-			Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-			intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-			intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+			Intent intent = Broadcast.createConversationIntent(
+				Broadcast.CONVERSATION_REMOVE,
+				server.getId(),
+				conversation.getName()
+			);
 			service.sendBroadcast(intent);
 			
 			service.getConnection(server.getId()).sendAction(conversation.getName(), action);
diff --git a/src/org/yaaic/command/handler/NamesHandler.java b/src/org/yaaic/command/handler/NamesHandler.java
index 845e842..4d546ba 100644
--- a/src/org/yaaic/command/handler/NamesHandler.java
+++ b/src/org/yaaic/command/handler/NamesHandler.java
@@ -60,9 +60,11 @@ public class NamesHandler extends BaseHandler
 		message.setColor(Message.COLOR_YELLOW);
 		conversation.addMessage(message);
 		
-		Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-		intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-		intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+		Intent intent = Broadcast.createConversationIntent(
+			Broadcast.CONVERSATION_REMOVE,
+			server.getId(),
+			conversation.getName()
+		);
 		service.sendBroadcast(intent);
 	}
 	
diff --git a/src/org/yaaic/command/handler/NoticeHandler.java b/src/org/yaaic/command/handler/NoticeHandler.java
index b9e20d9..82a91fb 100644
--- a/src/org/yaaic/command/handler/NoticeHandler.java
+++ b/src/org/yaaic/command/handler/NoticeHandler.java
@@ -53,9 +53,11 @@ public class NoticeHandler extends BaseHandler
 			message.setIcon(R.drawable.info);
 			conversation.addMessage(message);
 			
-			Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE);
-			intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-			intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName());
+			Intent intent = Broadcast.createConversationIntent(
+				Broadcast.CONVERSATION_REMOVE,
+				server.getId(),
+				conversation.getName()
+			);
 			service.sendBroadcast(intent);
 			
 			service.getConnection(server.getId()).sendNotice(params[1], text);
diff --git a/src/org/yaaic/command/handler/QueryHandler.java b/src/org/yaaic/command/handler/QueryHandler.java
index 54407e3..96540ff 100644
--- a/src/org/yaaic/command/handler/QueryHandler.java
+++ b/src/org/yaaic/command/handler/QueryHandler.java
@@ -59,9 +59,11 @@ public class QueryHandler extends BaseHandler
 			
 			server.addConversationl(new Query(params[1]));
 			
-			Intent intent = new Intent(Broadcast.CONVERSATION_NEW);
-			intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
-			intent.putExtra(Broadcast.EXTRA_CONVERSATION, params[1]);
+			Intent intent = Broadcast.createConversationIntent(
+				Broadcast.CONVERSATION_REMOVE,
+				server.getId(),
+				conversation.getName()
+			);
 			service.sendBroadcast(intent);
 		} else {
 			throw new CommandException("Invalid number of params");