diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java
index 11b0eb222..faaed15fb 100644
--- a/src/org/linphone/ChatStorage.java
+++ b/src/org/linphone/ChatStorage.java
@@ -328,7 +328,10 @@ public class ChatStorage {
 		ArrayList<String> chatList = new ArrayList<String>();
 		
 		if (useNativeAPI) {
-			//TODO
+			LinphoneChatRoom[] chats = LinphoneManager.getLc().getChatRooms();
+			for (LinphoneChatRoom chatroom : chats) {
+				chatList.add(chatroom.getPeerAddress().asStringUriOnly());
+			}
 		} else {
 			Cursor c = db.query(TABLE_NAME, null, null, null, "remoteContact", null, "id DESC");
 			while (c != null && c.moveToNext()) {
diff --git a/submodules/linphone b/submodules/linphone
index 952adab4f..1ccf89e4f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 952adab4f85dec18fbe980296c2c5462def1fc92
+Subproject commit 1ccf89e4fbd6618a9d4a77b54d62c1ce8bb4fa0d