diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index 39a730ef..4247bcfe 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -61,8 +61,7 @@
         android:layout_below="@id/server_address"
         android:layout_marginTop="10dp"
         android:onClick="onClickHandler"
-        android:text="@string/refresh"
-        android:visibility="visible"/>
+        android:text="@string/refresh"/>
 
     <Button
         android:id="@+id/button_upload"
@@ -74,6 +73,24 @@
         android:onClick="onClickHandler"
         android:text="@string/upload"/>
 
+    <Button
+        android:id="@+id/button_download"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@id/button_upload"
+        android:layout_marginTop="10dp"
+        android:onClick="onClickHandler"
+        android:text="@string/download"/>
+
+    <!--<Button-->
+    <!--android:id="@+id/button_delete_remote"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentLeft="true"-->
+    <!--android:onClick="onClickHandler"-->
+    <!--android:text="@string/delete_remote_file"/>-->
+
     <!--<ListView-->
     <!--android:id="@+id/list_view"-->
     <!--android:layout_width="match_parent"-->
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index ca1128fc..4bf84f33 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -183,6 +183,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	    	case R.id.button_upload:
 	    		startUpload();
 	    		break;
+			case R.id.button_download:
+	    		startDownload();
+	    		break;
 //	    	case R.id.button_delete_remote:
 //	    		startRemoteDeletion();
 //	    		break;
@@ -303,7 +306,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     private void startUpload() {
 
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	File fileToUpload = upFolder.listFiles()[0];
+    	final File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
     	String mimeType = getString(R.string.sample_file_mimetype);
 
@@ -349,9 +352,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				} else { // Successful response
 
-					final String putResult = response.body().string();
-
-					showSuccessfulMessage("Successful upload");
+					showSuccessfulMessage("Successful upload of " + fileToUpload.getName());
 				}
 			}
 
@@ -359,9 +360,54 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 				e.printStackTrace();
 			}
 		});
-
     }
 
+	private void startDownload() {
+		File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
+		downFolder.mkdir();
+		File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+		final File fileToUpload = upFolder.listFiles()[0];
+		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
+
+		if (!validServerAddress()) return;
+
+//		Let's first use OKHttp with the new endpoint without depending on our library operations
+
+//		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
+//		downloadOperation.addDatatransferProgressListener(this);
+//		downloadOperation.execute(mClient, this, mHandler);
+
+		final Request request = new Request.Builder()
+				.url(URL + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.addHeader(AUTHORIZATION_HEADER, mCredentials)
+				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
+				.get()
+				.build();
+
+
+		mOkHttpClient.newCall(request).enqueue(new Callback() {
+
+			@Override public void onResponse(Call call, final Response response) throws IOException {
+
+				if (!response.isSuccessful()) {
+
+					showUnsuccessfulMessage(response.code());
+
+					throw new IOException("Unexpected code " + response);
+
+				} else { // Successful response
+
+					showSuccessfulMessage("Successful download of " + fileToUpload.getName() + " although local file " +
+							"won't be created in this stage");
+				}
+			}
+
+			@Override public void onFailure(Call call, IOException e) {
+				e.printStackTrace();
+			}
+		});
+	}
+
 	private void startRemoteDeletion() {
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0]; 
@@ -370,17 +416,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     	removeOperation.execute(mClient, this, mHandler);
     }
     
-    private void startDownload() {
-    	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
-    	downFolder.mkdir();
-    	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	File fileToUpload = upFolder.listFiles()[0];
-    	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
-    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
-    	downloadOperation.addDatatransferProgressListener(this);
-    	downloadOperation.execute(mClient, this, mHandler);
-    }
-    
     @SuppressWarnings("deprecation")
 	private void startLocalDeletion() {
     	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));