diff --git a/app/src/main/res/layout/playlist_header.xml b/app/src/main/res/layout/playlist_header.xml
index f49ca295d..93fde3b8f 100644
--- a/app/src/main/res/layout/playlist_header.xml
+++ b/app/src/main/res/layout/playlist_header.xml
@@ -33,8 +33,6 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="6dp"
             android:layout_marginTop="6dp"
-            android:layout_toLeftOf="@+id/playlist_stream_count"
-            android:layout_toStartOf="@+id/playlist_stream_count"
             android:background="?attr/selectableItemBackground"
             android:gravity="left|center_vertical"
             android:padding="2dp"
@@ -65,23 +63,25 @@
                 tools:ignore="RtlHardcoded"
                 tools:text="Typical uploader name"/>
         </RelativeLayout>
-
-        <TextView
-            android:id="@+id/playlist_stream_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/uploader_layout"
-            android:layout_alignTop="@+id/uploader_layout"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="6dp"
-            android:ellipsize="end"
-            android:gravity="right|center_vertical"
-            android:maxLines="1"
-            android:textSize="@dimen/playlist_detail_subtext_size"
-            tools:ignore="RtlHardcoded"
-            tools:text="234 videos"/>
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/playlist_stream_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/playlist_title_view"
+        android:layout_alignBottom="@+id/playlist_meta"
+        android:layout_alignTop="@+id/playlist_meta"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="6dp"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:gravity="right|center_vertical"
+        android:maxLines="1"
+        android:textSize="@dimen/playlist_detail_subtext_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="234 videos"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/playlist_header_no_uploader.xml b/app/src/main/res/layout/playlist_header_no_uploader.xml
new file mode 100644
index 000000000..0f692c690
--- /dev/null
+++ b/app/src/main/res/layout/playlist_header_no_uploader.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    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_height="wrap_content"
+    android:background="?attr/contrast_background_color">
+
+    <TextView
+        android:id="@+id/playlist_title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@id/playlist_stream_count"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="@dimen/playlist_detail_title_text_size"
+        tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/playlist_title_view"
+        android:id="@+id/playlist_meta">
+        <RelativeLayout
+            android:id="@+id/uploader_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/playlist_detail_uploader_layout_height"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginTop="6dp"
+            android:background="?attr/selectableItemBackground"
+            android:gravity="left|center_vertical"
+            android:padding="2dp"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:visibility="gone">
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/uploader_avatar_view"
+                android:layout_width="@dimen/playlist_detail_uploader_image_size"
+                android:layout_height="@dimen/playlist_detail_uploader_image_size"
+                android:layout_alignParentLeft="true"
+                android:layout_margin="1dp"
+                android:src="@drawable/buddy"
+                app:civ_border_color="#ffffff"
+                app:civ_border_width="1dp"/>
+
+            <TextView
+                android:id="@+id/uploader_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="4dp"
+                android:layout_toRightOf="@+id/uploader_avatar_view"
+                android:ellipsize="end"
+                android:gravity="left|center_vertical"
+                android:maxLines="1"
+                android:textSize="@dimen/playlist_detail_subtext_size"
+                tools:ignore="RtlHardcoded"
+                tools:text="Typical uploader name"/>
+        </RelativeLayout>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/playlist_stream_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/playlist_title_view"
+        android:layout_alignBottom="@+id/playlist_title_view"
+        android:layout_alignTop="@+id/playlist_title_view"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="6dp"
+        android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:gravity="right|top"
+        android:maxLines="1"
+        android:textSize="@dimen/playlist_detail_subtext_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="234 videos"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/playlist_title_view">
+
+        <include layout="@layout/playlist_control"/>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file