diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae722c6..24ff2bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed de/serialization issues of backends' `none` variant. [#523]
 
+- Fixed list envelopes out of bound error when empty result. [#518]
+
 ## [1.0.0] - 2024-12-09
 
 The Himalaya CLI scope has changed. It does not include anymore the synchronization, nor the envelope watching. These scopes have moved to dedicated projects:
@@ -951,6 +953,7 @@ Few major concepts changed:
 [#496]: https://github.com/pimalaya/himalaya/issues/496
 [#508]: https://github.com/pimalaya/himalaya/issues/508
 [#515]: https://github.com/pimalaya/himalaya/issues/515
+[#518]: https://github.com/pimalaya/himalaya/issues/518
 [#522]: https://github.com/pimalaya/himalaya/issues/522
 [#523]: https://github.com/pimalaya/himalaya/issues/523
 [#536]: https://github.com/pimalaya/himalaya/issues/536
diff --git a/Cargo.lock b/Cargo.lock
index d080a060..70ce8931 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1200,7 +1200,7 @@ dependencies = [
 [[package]]
 name = "email-lib"
 version = "0.26.2"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1828,7 +1828,7 @@ dependencies = [
 [[package]]
 name = "http-lib"
 version = "0.1.0"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "thiserror 1.0.69",
  "tokio",
@@ -2275,7 +2275,7 @@ dependencies = [
 [[package]]
 name = "keyring-lib"
 version = "1.0.2"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "keyring",
  "once_cell",
@@ -2600,7 +2600,7 @@ dependencies = [
 [[package]]
 name = "mml-lib"
 version = "1.1.1"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "async-recursion",
  "chumsky",
@@ -2799,7 +2799,7 @@ dependencies = [
 [[package]]
 name = "oauth-lib"
 version = "2.0.0"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "http-lib",
  "oauth2",
@@ -3083,7 +3083,7 @@ dependencies = [
 [[package]]
 name = "pgp-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "async-recursion",
  "futures",
@@ -3262,7 +3262,7 @@ dependencies = [
 [[package]]
 name = "process-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "serde",
  "thiserror 1.0.69",
@@ -3738,7 +3738,7 @@ dependencies = [
 [[package]]
 name = "secret-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#da79a2457c4d8459a6f261b4a9814bef99f3f048"
+source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
 dependencies = [
  "keyring-lib",
  "process-lib",