diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24ff2bea..390198c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ 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]
+- Fixed list envelopes out of bound error when empty result. [#535]
 
 ## [1.0.0] - 2024-12-09
 
@@ -956,5 +956,6 @@ Few major concepts changed:
 [#518]: https://github.com/pimalaya/himalaya/issues/518
 [#522]: https://github.com/pimalaya/himalaya/issues/522
 [#523]: https://github.com/pimalaya/himalaya/issues/523
+[#535]: https://github.com/pimalaya/himalaya/issues/535
 [#536]: https://github.com/pimalaya/himalaya/issues/536
 [core#10]: https://github.com/pimalaya/core/issues/10
diff --git a/Cargo.lock b/Cargo.lock
index 70ce8931..3aa1d130 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#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1828,7 +1828,7 @@ dependencies = [
 [[package]]
 name = "http-lib"
 version = "0.1.0"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "thiserror 1.0.69",
  "tokio",
@@ -2032,8 +2032,7 @@ dependencies = [
 [[package]]
 name = "imap-client"
 version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072d1848cdf0d9b2e1632cea3d22a0f935a610e7a9ea14e7c8b37e85fa131495"
+source = "git+https://github.com/pimalaya/imap-client#cfd385c63170b4eafe472d343b8e79774eab5834"
 dependencies = [
  "imap-next",
  "rip-starttls",
@@ -2275,7 +2274,7 @@ dependencies = [
 [[package]]
 name = "keyring-lib"
 version = "1.0.2"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "keyring",
  "once_cell",
@@ -2600,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "mml-lib"
 version = "1.1.1"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "async-recursion",
  "chumsky",
@@ -2799,7 +2798,7 @@ dependencies = [
 [[package]]
 name = "oauth-lib"
 version = "2.0.0"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "http-lib",
  "oauth2",
@@ -3083,7 +3082,7 @@ dependencies = [
 [[package]]
 name = "pgp-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "async-recursion",
  "futures",
@@ -3262,7 +3261,7 @@ dependencies = [
 [[package]]
 name = "process-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "serde",
  "thiserror 1.0.69",
@@ -3738,7 +3737,7 @@ dependencies = [
 [[package]]
 name = "secret-lib"
 version = "1.0.0"
-source = "git+https://github.com/pimalaya/core#3167e48e7feb5eb4d12cd86fd403c2c26c9aee9e"
+source = "git+https://github.com/pimalaya/core#f30a2f535cc6636032d937d23c41ac5e5ff541b6"
 dependencies = [
  "keyring-lib",
  "process-lib",
diff --git a/Cargo.toml b/Cargo.toml
index a135054e..e8144556 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,7 @@ uuid = { version = "0.8", features = ["v4"] }
 
 [patch.crates-io]
 email-lib.git = "https://github.com/pimalaya/core"
+imap-client.git = "https://github.com/pimalaya/imap-client"
 keyring-lib.git = "https://github.com/pimalaya/core"
 mml-lib.git = "https://github.com/pimalaya/core"
 oauth-lib.git = "https://github.com/pimalaya/core"