diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
index 3c6ac29..430c783 100644
--- a/application/src/org/yaaic/activity/ConversationActivity.java
+++ b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -784,7 +784,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
                                 if (query == null) {
                                     // Open a query if there's none yet
                                     query = new Query(nicknameWithoutPrefix);
-                                    server.addConversationl(query);
+                                    server.addConversation(query);
 
                                     Intent intent = Broadcast.createConversationIntent(
                                         Broadcast.CONVERSATION_NEW,
diff --git a/application/src/org/yaaic/command/handler/QueryHandler.java b/application/src/org/yaaic/command/handler/QueryHandler.java
index 334a6be..8a13992 100644
--- a/application/src/org/yaaic/command/handler/QueryHandler.java
+++ b/application/src/org/yaaic/command/handler/QueryHandler.java
@@ -60,7 +60,7 @@ public class QueryHandler extends BaseHandler
             }
 
             query = new Query(params[1]);
-            server.addConversationl(query);
+            server.addConversation(query);
 
             Intent intent = Broadcast.createConversationIntent(
                 Broadcast.CONVERSATION_NEW,
diff --git a/application/src/org/yaaic/irc/IRCConnection.java b/application/src/org/yaaic/irc/IRCConnection.java
index 82d79fb..8375861 100644
--- a/application/src/org/yaaic/irc/IRCConnection.java
+++ b/application/src/org/yaaic/irc/IRCConnection.java
@@ -224,7 +224,7 @@ public class IRCConnection extends PircBot
             if (conversation == null) {
                 // Open a query if there's none yet
                 conversation = new Query(sender);
-                server.addConversationl(conversation);
+                server.addConversation(conversation);
                 conversation.addMessage(message);
 
                 Intent intent = Broadcast.createConversationIntent(
@@ -341,7 +341,7 @@ public class IRCConnection extends PircBot
     {
         if (sender.equalsIgnoreCase(getNick())) {
             // We joined a new channel
-            server.addConversationl(new Channel(target));
+            server.addConversation(new Channel(target));
 
             Intent intent = Broadcast.createConversationIntent(
                 Broadcast.CONVERSATION_NEW,
@@ -593,7 +593,7 @@ public class IRCConnection extends PircBot
             // Open a query if there's none yet
             conversation = new Query(sender);
             conversation.addMessage(message);
-            server.addConversationl(conversation);
+            server.addConversation(conversation);
 
             Intent intent = Broadcast.createConversationIntent(
                 Broadcast.CONVERSATION_NEW,
diff --git a/application/src/org/yaaic/model/Server.java b/application/src/org/yaaic/model/Server.java
index 349b6d8..e28e405 100644
--- a/application/src/org/yaaic/model/Server.java
+++ b/application/src/org/yaaic/model/Server.java
@@ -319,7 +319,7 @@ public class Server
      * 
      * @param conversation The conversation to add
      */
-    public void addConversationl(Conversation conversation)
+    public void addConversation(Conversation conversation)
     {
         conversations.put(conversation.getName().toLowerCase(), conversation);
     }
diff --git a/test/src/org/yaaic/test/model/ServerTest.java b/test/src/org/yaaic/test/model/ServerTest.java
index a8ea64b..22c4543 100644
--- a/test/src/org/yaaic/test/model/ServerTest.java
+++ b/test/src/org/yaaic/test/model/ServerTest.java
@@ -141,14 +141,14 @@ public class ServerTest extends TestCase
 	{
 		Channel channel = new Channel("#yaaic");
 		
-		server.addConversationl(channel);
+		server.addConversation(channel);
 		assertEquals(2, server.getConversations().size());
 		assertNotNull(server.getConversation("#yaaic"));
 		
 		// ignore case
 		assertNotNull(server.getConversation("#yAAic"));
 		
-		server.addConversationl(new Query("pocmo"));
+		server.addConversation(new Query("pocmo"));
 		assertEquals(3, server.getConversations().size());
 		
 		// test order