diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
index e09c71406..b3b4eb0b2 100644
--- a/res/layout-sw533dp-land/chatlist_cell.xml
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -89,7 +89,7 @@
 				style="@style/font18"
 				android:gravity="center"
 				android:maxLines="1"
-				android:layout_above="@+id/lastMessage"
+				android:layout_above="@+id/lastMessageLayout"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"/>
 
diff --git a/res/layout-sw533dp/chatlist_cell.xml b/res/layout-sw533dp/chatlist_cell.xml
index 4750c1a27..81050177f 100644
--- a/res/layout-sw533dp/chatlist_cell.xml
+++ b/res/layout-sw533dp/chatlist_cell.xml
@@ -90,7 +90,7 @@
 				style="@style/font18"
 				android:gravity="center"
 				android:maxLines="1"
-				android:layout_above="@+id/lastMessage"
+				android:layout_above="@+id/lastMessageLayout"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"/>
 
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 85a93b080..4c42d4aff 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -167,9 +167,9 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 		    Address remoteSender = message.getFromAddress();
 			String displayName;
 
+		    LinphoneContact contact = null;
 		    if (message.isOutgoing()) {
 			    message.setListener(ChatEventsAdapter.this);
-			    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
 
 			    if (status == ChatMessage.State.InProgress) {
 				    holder.messageSendingInProgress.setVisibility(View.VISIBLE);
@@ -227,31 +227,12 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
 			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
 		    } else {
-			    LinphoneContact contact = null;
 			    for (LinphoneContact c : mParticipants) {
 				    if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
 					    contact = c;
 					    break;
 				    }
 			    }
-			    if (contact == null) {
-			    	contact = ContactsManager.getInstance().findContactFromAddress(remoteSender);
-			    }
-			    if (contact != null) {
-				    if (contact.getFullName() != null) {
-					    displayName = contact.getFullName();
-				    } else {
-					    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
-				    }
-
-				    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-				    if (contact.hasPhoto()) {
-					    LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
-				    }
-			    } else {
-				    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
-				    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-			    }
 
 			    if (isEditionEnabled()) {
 				    layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
@@ -267,6 +248,25 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
 			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask);
 		    }
+
+		    if (contact == null) {
+			    contact = ContactsManager.getInstance().findContactFromAddress(remoteSender);
+		    }
+		    if (contact != null) {
+			    if (contact.getFullName() != null) {
+				    displayName = contact.getFullName();
+			    } else {
+				    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
+			    }
+
+			    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+			    if (contact.hasPhoto()) {
+				    LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
+			    }
+		    } else {
+			    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
+			    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+		    }
 		    holder.contactName.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.messages_date_format) + " - " + displayName);
 
 		    if (message.hasTextContent()) {