diff --git a/src/android/org/linphone/call/CallIncomingActivity.java b/src/android/org/linphone/call/CallIncomingActivity.java
index be5c9afaa..010c8655e 100644
--- a/src/android/org/linphone/call/CallIncomingActivity.java
+++ b/src/android/org/linphone/call/CallIncomingActivity.java
@@ -46,14 +46,18 @@ import org.linphone.core.Address;
 import org.linphone.core.Call;
 import org.linphone.core.Call.State;
 import org.linphone.core.CallParams;
+import org.linphone.core.ChatRoomSecurityLevel;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
+import org.linphone.core.ProxyConfig;
 import org.linphone.mediastream.Log;
 import org.linphone.ui.LinphoneSliders.LinphoneSliderTriggered;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.linphone.LinphoneUtils.getSecurityLevelForSipUri;
+
 public class CallIncomingActivity extends LinphoneGenericActivity implements LinphoneSliderTriggered {
 	private static CallIncomingActivity instance;
 
@@ -238,6 +242,18 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin
 		if (contact != null) {
 			LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
 			name.setText(contact.getFullName());
+			ProxyConfig prx = LinphoneManager.getLc().getDefaultProxyConfig();
+			Address ourUri = (prx != null) ? prx.getIdentityAddress() : null;
+			ChatRoomSecurityLevel securityLevel = getSecurityLevelForSipUri(LinphoneManager.getLc(), ourUri, contact.getFriend().getAddress());
+			if (securityLevel == ChatRoomSecurityLevel.Safe) {
+				contactPicture.setImageResource(R.drawable.avatar_big_secure2);
+			} else if (securityLevel == ChatRoomSecurityLevel.Unsafe) {
+				contactPicture.setImageResource(R.drawable.avatar_big_unsecure);
+			} else if (securityLevel == ChatRoomSecurityLevel.Encrypted) {
+				contactPicture.setImageResource(R.drawable.avatar_big_secure1);
+			} else {
+				contactPicture.setImageResource(R.drawable.avatar_medium_unregistered);
+			}
 		} else {
 			name.setText(LinphoneUtils.getAddressDisplayName(address));
 		}
diff --git a/src/android/org/linphone/call/CallOutgoingActivity.java b/src/android/org/linphone/call/CallOutgoingActivity.java
index 9b71192d7..f8a03830c 100644
--- a/src/android/org/linphone/call/CallOutgoingActivity.java
+++ b/src/android/org/linphone/call/CallOutgoingActivity.java
@@ -33,8 +33,10 @@ import org.linphone.activities.LinphoneGenericActivity;
 import org.linphone.core.Address;
 import org.linphone.core.Call;
 import org.linphone.core.Call.State;
+import org.linphone.core.ChatRoomSecurityLevel;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
+import org.linphone.core.ProxyConfig;
 import org.linphone.core.Reason;
 import org.linphone.mediastream.Log;
 
@@ -54,6 +56,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import static org.linphone.LinphoneUtils.getSecurityLevelForSipUri;
+
 public class CallOutgoingActivity extends LinphoneGenericActivity implements OnClickListener{
 	private static CallOutgoingActivity instance;
 
@@ -190,6 +194,19 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
 		if (contact != null) {
 			LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
 			name.setText(contact.getFullName());
+
+			ProxyConfig prx = LinphoneManager.getLc().getDefaultProxyConfig();
+			Address ourUri = (prx != null) ? prx.getIdentityAddress() : null;
+			ChatRoomSecurityLevel securityLevel = getSecurityLevelForSipUri(LinphoneManager.getLc(), ourUri, contact.getFriend().getAddress());
+			if (securityLevel == ChatRoomSecurityLevel.Safe) {
+				contactPicture.setImageResource(R.drawable.avatar_big_secure2);
+			} else if (securityLevel == ChatRoomSecurityLevel.Unsafe) {
+				contactPicture.setImageResource(R.drawable.avatar_big_unsecure);
+			} else if (securityLevel == ChatRoomSecurityLevel.Encrypted) {
+				contactPicture.setImageResource(R.drawable.avatar_big_secure1);
+			} else {
+				contactPicture.setImageResource(R.drawable.avatar_medium_unregistered);
+			}
 		} else {
 			name.setText(LinphoneUtils.getAddressDisplayName(address));
 		}
diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index df75cc45f..6c2f0ae48 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -572,11 +572,11 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 				holder.separator.setVisibility(View.GONE);
 			}
 
-			if (contact.isInFriendList()) {
+			/*if (contact.isInFriendList()) {
 				holder.linphoneFriend.setVisibility(View.VISIBLE);
 			} else {
 				holder.linphoneFriend.setVisibility(View.GONE);
-			}
+			}*/
 
 			holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
 			if (contact.hasPhoto()) {