diff --git a/documentation/messaging.md b/documentation/messaging.md
index 3ee5a4b0c..3aa595dae 100644
--- a/documentation/messaging.md
+++ b/documentation/messaging.md
@@ -17,7 +17,7 @@ and then send them a text message:
 
 ```
 // Assume we've created an XMPPConnection name "connection"._
-ChatManager chatmanager = connection.getChatManager();
+ChatManager chatmanager = ChatManager.getInstanceFor(connection);
 Chat newChat = chatmanager.createChat("jsmith@jivesoftware.com", new MessageListener() {
 	public void processMessage(Chat chat, Message message) {
 		System.out.println("Received message: " + message);
@@ -72,8 +72,9 @@ when it happens. You can register a message listener to receive all future
 messages as part of this handler.
 
 ```
-_// Assume we've created an XMPPConnection name "connection"._
-ChatManager chatmanager = connection.getChatManager().addChatListener(
+// Assume we've created an XMPPConnection name "connection"._
+ChatManager chatManager = ChatManager.getInstanceFor(connection);
+chatManager.addChatListener(
 	new ChatManagerListener() {
 		@Override
 		public void chatCreated(Chat chat, boolean createdLocally)