diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 14b6f772..80412b11 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -35,6 +35,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.util.concurrent.TimeUnit;
+
 import okhttp3.HttpUrl;
 
 
@@ -111,6 +113,10 @@ public class MoveRemoteFileOperation extends RemoteOperation {
                     HttpUrl.parse( client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
+
+            move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
+            move.setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+
             //int status = client.executeMethod(move, MOVE_READ_TIMEOUT, MOVE_CONNECTION_TIMEOUT);
             final int status = client.executeHttpMethod(move);
             /// process response
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 517ae545..d6599dd9 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
@@ -108,7 +109,10 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
                     WebdavUtils.encodePath(mOldRemotePath)),
                     client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
-            //TODO: client.execute(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
+
+            move.setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
+            move.setConnectionTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
+
             final int status = client.executeHttpMethod(move);
             final RemoteOperationResult result =
                     (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT)