diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java
index 02532be4..13c64b0a 100644
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java
@@ -9,18 +9,49 @@ import com.google.api.services.drive.DriveScopes;
 
 import org.cryptomator.data.BuildConfig;
 import org.cryptomator.domain.exception.FatalBackendException;
+import org.cryptomator.util.SharedPreferencesHandler;
 
 import java.util.Collections;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import timber.log.Timber;
 
 class GoogleDriveClientFactory {
 
 	private final Context context;
+	private final SharedPreferencesHandler sharedPreferencesHandler;
 
-	GoogleDriveClientFactory(Context context) {
+	GoogleDriveClientFactory(Context context, SharedPreferencesHandler sharedPreferencesHandler) {
 		this.context = context;
+		this.sharedPreferencesHandler = sharedPreferencesHandler;
 	}
 
 	Drive getClient(String accountName) throws FatalBackendException {
+		if(sharedPreferencesHandler.debugMode()) {
+			Logger.getLogger("com.google.api.client").setLevel(Level.CONFIG);
+			Logger.getLogger("com.google.api.client").addHandler(new Handler() {
+				@Override
+				public void publish(LogRecord record) {
+					if(record.getMessage().startsWith("-------------- RESPONSE --------------")
+							|| record.getMessage().startsWith("-------------- REQUEST  --------------")
+							|| record.getMessage().startsWith("{\n \"files\": [\n")) {
+						Timber.tag("GoogleDriveClient").d(record.getMessage());
+					}
+				}
+
+				@Override
+				public void flush() {
+				}
+
+				@Override
+				public void close() throws SecurityException {
+				}
+			});
+		}
+
 		try {
 			FixedGoogleAccountCredential credential = FixedGoogleAccountCredential.usingOAuth2(context, Collections.singleton(DriveScopes.DRIVE));
 			credential.setAccountName(accountName);
diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java
index 0ccebe23..0bb53f0f 100644
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.java
@@ -69,7 +69,7 @@ class GoogleDriveImpl {
 	}
 
 	private Drive client() {
-		return new GoogleDriveClientFactory(context) //
+		return new GoogleDriveClientFactory(context, sharedPreferencesHandler) //
 				.getClient(googleDriveCloud.accessToken());
 	}