diff --git a/briar-android/res/layout/list_item_msg_in.xml b/briar-android/res/layout/list_item_msg_in.xml
index 13ec9b287..9303ca2b0 100644
--- a/briar-android/res/layout/list_item_msg_in.xml
+++ b/briar-android/res/layout/list_item_msg_in.xml
@@ -1,51 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+	android:id="@+id/msgLayout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:orientation="horizontal">
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:background="@drawable/msg_in"
+	android:orientation="vertical">
 
-	<de.hdodenhof.circleimageview.CircleImageView
-		android:id="@+id/msgAvatar"
-		android:layout_width="@dimen/listitem_picture_size"
-		android:layout_height="@dimen/listitem_picture_size"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginStart="@dimen/margin_medium"
-		android:visibility="gone"
-		app:civ_border_color="@color/briar_text_primary"
-		app:civ_border_width="@dimen/avatar_border_width"
-		tools:src="@drawable/ic_launcher"/>
-
-	<LinearLayout
-		android:id="@+id/msgLayout"
+	<TextView
+		android:id="@+id/msgBody"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:background="@drawable/msg_in"
-		android:orientation="vertical"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail">
+		android:textIsSelectable="true"
+		android:textSize="@dimen/text_size_medium"
+		tools:text="Short message"/>
 
-		<TextView
-			android:id="@+id/msgBody"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textIsSelectable="true"
-			android:textSize="@dimen/text_size_medium"
-			tools:text="Short message"/>
+	<TextView
+		android:id="@+id/msgTime"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right|end"
+		android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+		android:maxLines="1"
+		android:textColor="@color/private_message_date"
+		android:textSize="@dimen/text_size_tiny"
+		tools:text="Dec 24, 13:37"/>
 
-		<TextView
-			android:id="@+id/msgTime"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="right|end"
-			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			android:maxLines="1"
-			android:textColor="@color/private_message_date"
-			android:textSize="@dimen/text_size_tiny"
-			tools:text="Dec 24, 13:37"/>
-
-	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 0fb116b66..c027bf4d6 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -261,7 +261,7 @@ public class ConversationActivity extends BriarActivity
 					toolbarStatus
 							.setContentDescription(getString(R.string.offline));
 				}
-				adapter.setContactInformation(contactIdenticonKey, contactName);
+				adapter.setContactName(contactName);
 			}
 		});
 	}
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
index 3a90e4f99..ea67900a4 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
@@ -20,8 +20,6 @@ import org.briarproject.util.StringUtils;
 
 import java.util.List;
 
-import im.delight.android.identicons.IdenticonDrawable;
-
 import static android.support.v7.util.SortedList.INVALID_POSITION;
 import static android.support.v7.widget.RecyclerView.ViewHolder;
 import static org.briarproject.android.contact.ConversationItem.INTRODUCTION_IN;
@@ -83,7 +81,6 @@ class ConversationAdapter extends RecyclerView.Adapter {
 					});
 	private Context ctx;
 	private IntroductionHandler intro;
-	private byte[] identiconKey;
 	private String contactName;
 
 	public ConversationAdapter(Context context,
@@ -92,8 +89,7 @@ class ConversationAdapter extends RecyclerView.Adapter {
 		intro = introductionHandler;
 	}
 
-	public void setContactInformation(byte[] identiconKey, String contactName) {
-		this.identiconKey = identiconKey;
+	public void setContactName(String contactName) {
 		this.contactName = contactName;
 		notifyDataSetChanged();
 	}
@@ -174,8 +170,6 @@ class ConversationAdapter extends RecyclerView.Adapter {
 				ui.status.setImageResource(R.drawable.message_stored_white);
 			}
 		} else {
-			if (identiconKey != null)
-				ui.avatar.setImageDrawable(new IdenticonDrawable(identiconKey));
 			if (item.getType() == MSG_IN_UNREAD) {
 				// TODO implement new unread message highlight according to #232
 /*				int left = ui.layout.getPaddingLeft();
@@ -215,10 +209,6 @@ class ConversationAdapter extends RecyclerView.Adapter {
 			ui.messageLayout.setVisibility(View.GONE);
 		} else {
 			ui.messageLayout.setVisibility(View.VISIBLE);
-			if (item.getType() == INTRODUCTION_IN && identiconKey != null) {
-				ui.message.avatar.setImageDrawable(
-						new IdenticonDrawable(identiconKey));
-			}
 			ui.message.body.setText(message);
 			ui.message.date.setText(
 					DateUtils.getRelativeTimeSpanString(ctx, item.getTime()));
@@ -387,7 +377,6 @@ class ConversationAdapter extends RecyclerView.Adapter {
 		public TextView body;
 		public TextView date;
 		public ImageView status;
-		public ImageView avatar;
 
 		public MessageHolder(View v, int type) {
 			super(v);
@@ -399,8 +388,6 @@ class ConversationAdapter extends RecyclerView.Adapter {
 			// outgoing message (local)
 			if (type == MSG_OUT) {
 				status = (ImageView) v.findViewById(R.id.msgStatus);
-			} else {
-				avatar = (ImageView) v.findViewById(R.id.msgAvatar);
 			}
 		}
 	}