diff --git a/changelog/unreleased/4800 b/changelog/unreleased/4800
new file mode 100644
index 00000000000..3a7e17b270b
--- /dev/null
+++ b/changelog/unreleased/4800
@@ -0,0 +1,6 @@
+Bugfix: Add margin in members list for long display names in all cases
+
+An extra margin has been added to the right side in the list of members when the display name is long, preventing the text from overflowing.
+
+https://github.com/owncloud/android/issues/4781
+https://github.com/owncloud/android/pull/4800
diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index 1f72dd4c956..5dafba7156c 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -43,14 +43,16 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginEnd="@dimen/standard_half_margin"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/member_name"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/standard_half_margin"
+                android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_gravity="center_vertical"
                 android:text="@string/placeholder_filename"
                 android:textSize="@dimen/two_line_primary_text_size"
@@ -60,16 +62,16 @@
                 android:maxLines="1"/>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/member_role"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:layout_marginStart="@dimen/standard_half_margin"
-                    android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginBottom="@dimen/standard_half_margin"
                     android:text="@string/placeholder_sentence"
                     android:textSize="13sp"
@@ -136,4 +138,4 @@
         android:background="@android:color/darker_gray"
         android:alpha="0.5"/>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file