diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
index 98f27f9d1..71a508b7a 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
@@ -41,6 +41,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.res.ResourcesCompat;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
@@ -193,6 +194,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
                 holder.statusMessage.setText(statusMessage);
             } else {
                 holder.statusMessage.setText("");
+                alignUsernameVertical(holder);
             }
 
             if (statusIcon != null && !statusIcon.isEmpty()) {
@@ -213,6 +215,13 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
         }
     }
 
+    private void alignUsernameVertical(UserItem.UserItemViewHolder holder) {
+        ConstraintLayout.LayoutParams layoutParams =
+            (ConstraintLayout.LayoutParams) holder.contactDisplayName.getLayoutParams();
+        layoutParams.topMargin = (int) DisplayUtils.convertDpToPixel(10, context);
+        holder.contactDisplayName.setLayoutParams(layoutParams);
+    }
+
     @Override
     public boolean filter(String constraint) {
         return objectId != null &&
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 362ba90eb..606028377 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -47,6 +47,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.emoji.widget.EmojiTextView;
 import butterknife.BindView;
@@ -282,6 +283,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
                 holder.statusMessage.setText(participant.statusMessage);
             } else {
                 holder.statusMessage.setText("");
+                alignUsernameVertical(holder);
             }
 
             if (participant.statusIcon != null && !participant.statusIcon.isEmpty()) {
@@ -302,6 +304,13 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
         }
     }
 
+    private void alignUsernameVertical(UserItemViewHolder holder) {
+        ConstraintLayout.LayoutParams layoutParams =
+            (ConstraintLayout.LayoutParams) holder.contactDisplayName.getLayoutParams();
+        layoutParams.topMargin = (int) DisplayUtils.convertDpToPixel(10, context);
+        holder.contactDisplayName.setLayoutParams(layoutParams);
+    }
+
     @Override
     public boolean filter(String constraint) {
         return participant.getDisplayName() != null &&
diff --git a/app/src/main/res/layout/rv_item_conversation_info_participant.xml b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
index 6afc309de..974cc00aa 100644
--- a/app/src/main/res/layout/rv_item_conversation_info_participant.xml
+++ b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
@@ -21,7 +21,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/standard_half_margin"