diff --git a/res/layout/upload_list_item.xml b/res/layout/upload_list_item.xml
index df0b435d25..bfb22afdad 100755
--- a/res/layout/upload_list_item.xml
+++ b/res/layout/upload_list_item.xml
@@ -3,14 +3,14 @@
     android:id="@+id/ListItemLayout"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:layout_height="72dp"
+    android:layout_height="wrap_content"
     android:paddingTop="@dimen/standard_half_padding"
     android:paddingBottom="@dimen/standard_half_padding"
     >
 
     <FrameLayout
         android:layout_width="60dp"
-        android:layout_height="match_parent"
+        android:layout_height="72dp"
         android:focusable="false"
         android:focusableInTouchMode="false">
 
@@ -25,7 +25,7 @@
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:layout_gravity="center_vertical"
@@ -92,7 +92,7 @@
             android:textSize="12dip"/>
 
         <TextView
-            android:id="@+id/upload_local_path"
+            android:id="@+id/upload_remote_path"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/list_item_lastmod_and_filesize_text"
@@ -106,7 +106,7 @@
     
     <FrameLayout
         android:layout_width="56dp"
-        android:layout_height="match_parent"
+        android:layout_height="72dp"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:layout_gravity="center_vertical"
diff --git a/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java b/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
index 617d1f959b..97c9cb6683 100755
--- a/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
@@ -211,7 +211,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             fileTextView.setText(fileName);
 
             // remote path to parent folder
-            TextView pathTextView = (TextView) view.findViewById(R.id.upload_local_path);
+            TextView pathTextView = (TextView) view.findViewById(R.id.upload_remote_path);
             String remoteParentPath = upload.getRemotePath();
             remoteParentPath = new File(remoteParentPath).getParent();
             pathTextView.setText(mParentActivity.getString(R.string.app_name) + remoteParentPath);