diff --git a/app/src/main/java/com/etesync/syncadapter/log/Logger.kt b/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
index e04bf7f7..71597c65 100644
--- a/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
+++ b/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
@@ -95,7 +95,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener {
                         .setCategory(NotificationCompat.CATEGORY_STATUS)
                         .setPriority(NotificationCompat.PRIORITY_HIGH)
                         .setSubText(context.getString(R.string.logging_to_external_storage_warning))
-                        .setContentIntent(PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                        .setContentIntent(PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
                         .setStyle(NotificationCompat.BigTextStyle()
                                 .bigText(context.getString(R.string.logging_to_external_storage, logDir.path)))
                         .setOngoing(true)
@@ -124,4 +124,4 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener {
         Toast.makeText(context, context.getString(R.string.logging_couldnt_create_file), Toast.LENGTH_LONG).show()
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
index 62488fc5..5d387bf0 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
@@ -170,7 +170,7 @@ abstract class SyncAdapterService : Service() {
                     .setLargeIcon(App.getLauncherBitmap(context))
                     .setContentTitle(context.getString(R.string.sync_error_permissions))
                     .setContentText(context.getString(R.string.sync_error_permissions_text))
-                    .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))
+                    .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
                     .setCategory(NotificationCompat.CATEGORY_ERROR)
                     .build()
             val nm = NotificationManagerCompat.from(context)
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
index 500ca303..eb215877 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
@@ -105,7 +105,7 @@ class SyncNotification(internal val context: Context, internal val notificationT
                 .setAutoCancel(true)
                 .setCategory(category)
                 .setSmallIcon(icon)
-                .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))
+                .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
 
         if (bigText != null)
             builder.setStyle(NotificationCompat.BigTextStyle()
diff --git a/cert4android b/cert4android
index d01a3455..94df228f 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit d01a3455bdb7fb49362e3e7acef043d34b7124f6
+Subproject commit 94df228f8bb8f8f50e26b3f4a3a9a53f0b83a4d2