diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 3456a0e1..154b68b5 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -76,6 +76,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		if (message.getFileParams().width > 0
 				&& (message.getTransferable() == null
 				|| message.getTransferable().getStatus() != Transferable.STATUS_DELETED)) {
+			mSenderName.setVisibility(View.GONE);
 			mLastMessage.setVisibility(View.GONE);
 			imagePreview.setVisibility(View.VISIBLE);
 			activity.loadBitmap(message, imagePreview);
@@ -110,13 +111,13 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			if (message.getStatus() == Message.STATUS_RECEIVED) {
 				if (conversation.getMode() == Conversation.MODE_MULTI) {
 					mSenderName.setVisibility(View.VISIBLE);
-					mSenderName.setText(UIHelper.getMessageDisplayName(message));
+					mSenderName.setText(UIHelper.getMessageDisplayName(message).split("\\s+")[0]+':');
 				} else {
 					mSenderName.setVisibility(View.GONE);
 				}
 			} else {
 				mSenderName.setVisibility(View.VISIBLE);
-				mSenderName.setText(activity.getString(R.string.me));
+				mSenderName.setText(activity.getString(R.string.me)+':');
 			}
 		}
 
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 764cb28e..12605e6c 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -66,9 +66,10 @@
                         android:gravity="center_vertical"
                         android:layout_alignParentLeft="true"
                         android:text="@string/me"
-                        android:layout_marginRight="3sp"
+                        android:layout_marginRight="?attr/TextSeparation"
                         android:textColor="?attr/color_text_secondary"
-                        android:visibility="visible"/>
+                        android:visibility="visible"
+                        android:textSize="?attr/TextSizeBody"/>
 
                     <LinearLayout android:layout_width="match_parent"
                                   android:layout_height="wrap_content"
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 513d4975..af283d2f 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -17,6 +17,7 @@
 
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
+        <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
@@ -94,6 +95,7 @@
 
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
+        <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 9ba50ef3..33637e5b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -4,6 +4,7 @@
     <attr name="TextSizeInfo" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
+    <attr name="TextSeparation" format="dimension"/>
 
     <attr name="IconSize" format="dimension"/>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index e8f14a35..ad1640c3 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,7 @@
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
+        <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
 
         <item name="attr/color_text_primary">@color/black87</item>
@@ -81,6 +82,7 @@
         <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
+        <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
@@ -152,6 +154,7 @@
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
         <item name="TextSizeInfo">14sp</item>
         <item name="TextSizeBody">16sp</item>
+        <item name="TextSeparation">6sp</item>
         <item name="IconSize">20sp</item>
         <item name="TextSizeHeadline">22sp</item>
     </style>
@@ -160,6 +163,7 @@
         <item name="TextSizeInfo">14sp</item>
         <item name="TextSizeBody">16sp</item>
         <item name="IconSize">20sp</item>
+        <item name="TextSeparation">6sp</item>
         <item name="TextSizeHeadline">22sp</item>
     </style>