diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 4d5fbef62985..4ecf11151ede 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -461,10 +461,24 @@ private void updateDirectoryList() {
             mAdapter.setNewItemVector(files);
 
             Button btnChooseFolder = findViewById(R.id.uploader_choose_folder);
-            btnChooseFolder.setOnClickListener(this);
+            TextView noPermissionsMessage = findViewById(R.id.uploader_no_permissions_message);
+            if (getCurrentFolder().getHasAddFilePermission()) {
+                btnChooseFolder.setOnClickListener(this);
+                btnChooseFolder.setVisibility(View.VISIBLE);
+                noPermissionsMessage.setVisibility(View.GONE);
+            } else {
+                btnChooseFolder.setVisibility(View.GONE);
+                noPermissionsMessage.setVisibility(View.VISIBLE);
+            }
+
+            Button btnCancel = findViewById(R.id.uploader_cancel);
+            btnCancel.setOnClickListener(this);
 
-            Button btnNewFolder = findViewById(R.id.uploader_cancel);
-            btnNewFolder.setOnClickListener(this);
+            if (getCurrentFolder().getHasAddSubdirectoriesPermission()) {
+                mSortOptionsView.selectAdditionalView(SortOptionsView.AdditionalView.CREATE_FOLDER);
+            } else {
+                mSortOptionsView.selectAdditionalView(SortOptionsView.AdditionalView.HIDDEN);
+            }
 
             updateEmptyListMessage(getString(R.string.file_list_empty_title_all_files));
         }
diff --git a/owncloudApp/src/main/res/layout/files_folder_picker.xml b/owncloudApp/src/main/res/layout/files_folder_picker.xml
index 458c73baa678..a6b0ae3f65b4 100644
--- a/owncloudApp/src/main/res/layout/files_folder_picker.xml
+++ b/owncloudApp/src/main/res/layout/files_folder_picker.xml
@@ -41,6 +41,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         android:text="@string/folder_picker_no_permissions_message_text"
         tools:visibility="visible"/>
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:src="@drawable/uploader_list_separator" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/owncloudApp/src/main/res/layout/uploader_layout.xml b/owncloudApp/src/main/res/layout/uploader_layout.xml
index bca79d74b8e7..1527ab400c67 100644
--- a/owncloudApp/src/main/res/layout/uploader_layout.xml
+++ b/owncloudApp/src/main/res/layout/uploader_layout.xml
@@ -75,6 +75,17 @@
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <TextView
+            android:id="@+id/uploader_no_permissions_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/standard_padding"
+            android:paddingVertical="@dimen/standard_half_padding"
+            android:background="@color/warning_background_color"
+            android:visibility="gone"
+            android:text="@string/folder_picker_no_permissions_message_text"
+            tools:visibility="visible"/>
+
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"