diff --git a/owncloud-android-library b/owncloud-android-library
index 39e3ddaa07..573afa1538 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 39e3ddaa07b0943b034b34a84a33b4dc4c7475d0
+Subproject commit 573afa15382b67cc84f67fc9a7b2329a72ecb352
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 8b833df054..b7808f1e0d 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1031,14 +1031,21 @@ public class FileDisplayActivity extends HookActivity implements
                                         .equals(event));
 
                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
-                                equals(event) &&/// TODO refactor and make common
+                            equals(event) &&/// TODO refactor and make common
 
-                                synchResult != null && !synchResult.isSuccess() &&
-                                (ResultCode.UNAUTHORIZED.equals(synchResult.getCode()) ||
-                                        (synchResult.isException() && synchResult.getException()
-                                                instanceof AuthenticatorException))) {
+                            synchResult != null && !synchResult.isSuccess()) {
 
-                            requestCredentialsUpdate(context);
+                            if(ResultCode.UNAUTHORIZED.equals(synchResult.getCode()) ||
+                                synchResult.isIdPRedirection() ||
+                                (synchResult.isException() && synchResult.getException()
+                                    instanceof AuthenticatorException)) {
+
+                                requestCredentialsUpdate(context);
+
+                            } else if(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(synchResult.getCode())) {
+
+                                showUntrustedCertDialog(synchResult);
+                            }
 
                         }