diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index 08b6206a2..808f2fb09 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -25,12 +25,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
+    android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
-    android:paddingTop="@dimen/margin_between_elements"
-    android:paddingBottom="@dimen/margin_between_elements"
     android:paddingLeft="@dimen/double_margin_between_elements"
-    android:paddingRight="@dimen/double_margin_between_elements">
+    android:paddingTop="@dimen/margin_between_elements"
+    android:paddingRight="@dimen/double_margin_between_elements"
+    android:paddingBottom="@dimen/margin_between_elements">
 
     <FrameLayout
         android:id="@+id/dialogAvatarFrameLayout"
@@ -43,6 +43,7 @@
             android:id="@id/dialogAvatar"
             android:layout_width="48dp"
             android:layout_height="48dp"
+            android:contentDescription="@null"
             android:scaleType="centerCrop"
             tools:src="@tools:sample/avatars[0]" />
 
@@ -51,6 +52,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_gravity="bottom|end"
+            android:contentDescription="@string/protected_conversation"
             android:src="@drawable/ic_lock_grey600_24px" />
 
         <ImageView
@@ -58,6 +60,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_gravity="top|end"
+            android:contentDescription="@string/favorite_conversation"
             android:src="@drawable/ic_star_black_24dp"
             app:tint="@color/favorite_icon_tint"
             app:tintMode="src_in" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 56e6682b4..c384186d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,4 +355,6 @@
     <string name="nc_look_and_feel">Appearance &amp; Sounds</string>
     <string name="nc_settings_calls_sound">Calls sound</string>
     <string name="nc_settings_notifications_sound">Notifications sound</string>
+    <string name="protected_conversation">protected conversation</string>
+    <string name="favorite_conversation">favorite conversation</string>
 </resources>