diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java
index 510666d93..37d099692 100644
--- a/src/android/org/linphone/chat/ChatCreationFragment.java
+++ b/src/android/org/linphone/chat/ChatCreationFragment.java
@@ -38,6 +38,7 @@ import android.widget.TextView;
 
 import org.linphone.LinphoneManager;
 import org.linphone.contacts.ContactAddress;
+import org.linphone.contacts.ContactsManager;
 import org.linphone.contacts.SearchContactsListAdapter;
 import org.linphone.core.Address;
 import org.linphone.core.ChatRoom;
@@ -151,7 +152,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 			updateListSelected();
 		}
 
-		mOnlyDisplayLinphoneContacts = true;
+		mOnlyDisplayLinphoneContacts = ContactsManager.getInstance().getSIPContacts().size() > 0 ? true : false;
 		if (savedInstanceState != null ) {
 			mOnlyDisplayLinphoneContacts = savedInstanceState.getBoolean("onlySipContact", true);
 		}
diff --git a/src/android/org/linphone/contacts/SearchContactsListAdapter.java b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
index 939c10ebc..e2f62662a 100644
--- a/src/android/org/linphone/contacts/SearchContactsListAdapter.java
+++ b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
@@ -119,10 +119,12 @@ public class SearchContactsListAdapter extends BaseAdapter {
 			List<LinphoneContact> contacts = mOnlySipContact ? ContactsManager.getInstance().getSIPContacts() : ContactsManager.getInstance().getContacts();
 			for (LinphoneContact contact : contacts) {
 				for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) {
-					if (!mOnlySipContact || (mOnlySipContact && contact.getPresenceModelForUriOrTel(noa.getValue()) != null)) {
+					if (!mOnlySipContact || (mOnlySipContact && (noa.isSIPAddress() || contact.getPresenceModelForUriOrTel(noa.getValue()) != null))) {
 						Address address = LinphoneManager.getLc().interpretUrl(noa.getValue());
-						ContactAddress ca = new ContactAddress(contact, address.asString(), contact.isFriend());
-						list.add(ca);
+						if (address != null) {
+							ContactAddress ca = new ContactAddress(contact, address.asString(), contact.isFriend());
+							list.add(ca);
+						}
 					}
 				}
 			}
diff --git a/submodules/linphone b/submodules/linphone
index cb45d54d1..c300e10f1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cb45d54d1af48202019f2ea47a326938d9596b58
+Subproject commit c300e10f142cb3e8e70a99dc3c94aff584a7ea26