diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java
index dd8b3a4ef..8ac7d5ba9 100644
--- a/src/android/org/linphone/chat/ChatCreationFragment.java
+++ b/src/android/org/linphone/chat/ChatCreationFragment.java
@@ -137,11 +137,13 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 		mContactsList.setAdapter(mSearchAdapter);
 		mContactsList.setOnItemClickListener(this);
 		if (savedInstanceState != null && savedInstanceState.getStringArrayList("mContactsSelected") != null) {
+			mContactsSelectedLayout.removeAllViews();
 			// We need to get all contacts not only sip
 			for (String uri : savedInstanceState.getStringArrayList("mContactsSelected")) {
 				for (ContactAddress ca : mSearchAdapter.getContactsList()) {
 					if (ca.getAddress().compareTo(uri) == 0) {
-						updateContactsClick(ca, mSearchAdapter.getContactsSelectedList());
+						ca.setView(null);
+						addSelectedContactAddress(ca);
 						break;
 					}
 				}