diff --git a/CHANGELOG.md b/CHANGELOG.md
index f303b998955..56c0e04afe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ ownCloud admins and users.
 * Bugfix - Conflict in copy with files without extension: [#4222](https://github.com/owncloud/android/issues/4222)
 * Bugfix - Add "scope" parameter to /token endpoint HTTP requests: [#4260](https://github.com/owncloud/android/pull/4260)
 * Bugfix - Fix in the handling of the base URL: [#4279](https://github.com/owncloud/android/issues/4279)
+* Bugfix - Handle Http 423 (resource locked): [#4282](https://github.com/owncloud/android/issues/4282)
 * Bugfix - Copy folder into descendant in different spaces: [#4293](https://github.com/owncloud/android/issues/4293)
 * Change - Android library as a module instead of submodule: [#3962](https://github.com/owncloud/android/issues/3962)
 * Enhancement - Koin DSL: [#3966](https://github.com/owncloud/android/pull/3966)
@@ -123,6 +124,14 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4279
    https://github.com/owncloud/android/pull/4287
 
+* Bugfix - Handle Http 423 (resource locked): [#4282](https://github.com/owncloud/android/issues/4282)
+
+   App can gracefully show if the file is locked when done certain operations on
+   it.
+
+   https://github.com/owncloud/android/issues/4282
+   https://github.com/owncloud/android/pull/4285
+
 * Bugfix - Copy folder into descendant in different spaces: [#4293](https://github.com/owncloud/android/issues/4293)
 
    Copying a folder into another folder with the same name in a different space now
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt
index a6e96758512..dab7111d9c8 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt
@@ -58,7 +58,11 @@ class OCFileLoggingTree(
             it.list()?.let { logFiles ->
                 if (logFiles.isNotEmpty()) {
 
-                    val lastDateLogFileString = logFiles.last().substringAfterLast("owncloud.").substringBeforeLast(".log")
+                    val lastDateLogFileString = if (context != null) {
+                        logFiles.last().substringAfterLast("${context.packageName}.").substringBeforeLast(".log")
+                    } else {
+                        logFiles.last().substringAfterLast("$filename.").substringBeforeLast(".log")
+                    }
 
                     val dateFormat = SimpleDateFormat(LOG_FILE_TIME_FORMAT)
                     val lastDayLogFileDate = dateFormat.parse(lastDateLogFileString)