diff --git a/Cargo.lock b/Cargo.lock
index 36ea5f1..773859c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1912,12 +1912,10 @@ dependencies = [
 [[package]]
 name = "imap-client"
 version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e667382fe3b5f75c78af4f7028a44435ed5f6da8e91500037115cee1569d8c5"
+source = "git+https://github.com/pimalaya/imap-client#c7e7dfb4779a2166d09ce18d8575f4e09e55e184"
 dependencies = [
  "imap-next",
- "once_cell",
- "rustls-native-certs 0.8.0",
+ "rustls-platform-verifier",
  "thiserror",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -3370,19 +3368,6 @@ dependencies = [
  "security-framework 2.11.1",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "schannel",
- "security-framework 2.11.1",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -3419,7 +3404,7 @@ dependencies = [
  "log",
  "once_cell",
  "rustls 0.23.16",
- "rustls-native-certs 0.7.3",
+ "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki 0.102.8",
  "security-framework 2.11.1",
diff --git a/Cargo.toml b/Cargo.toml
index 46983b6..d83c23e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +67,7 @@ url = "2.2"
 uuid = { version = "0.8", features = ["v4"] }
 
 [patch.crates-io]
+imap-client = { git = "https://github.com/pimalaya/imap-client" }
 email-lib = { git = "https://github.com/pimalaya/core" }
 process-lib = { git = "https://github.com/pimalaya/core" }
 secret-lib = { git = "https://github.com/pimalaya/core" }
diff --git a/flake.lock b/flake.lock
index ebc91aa..86a4dc9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,16 +79,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "lastModified": 1730137625,
+        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 1b7dc9b..41362cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "CLI to manage emails";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     gitignore = {
       url = "github:hercules-ci/gitignore.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -66,30 +66,21 @@
           };
         };
 
-        aarch64-linux = {
-          aarch64-linux = {
-            rustTarget = "aarch64-unknown-linux-musl";
-          };
+        aarch64-linux.aarch64-linux = {
+          rustTarget = "aarch64-unknown-linux-musl";
         };
 
         x86_64-darwin.x86_64-darwin = {
           rustTarget = "x86_64-apple-darwin";
           mkPackage = { pkgs, ... }: package:
-            let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) AppKit Cocoa CoreFoundation;
+            let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
             in package // {
-              buildInputs = [ AppKit Cocoa CoreFoundation ];
-              NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation";
+              NIX_LDFLAGS = "-F${Security}/Library/Frameworks -framework Security";
             };
         };
 
         aarch64-darwin.aarch64-darwin = {
           rustTarget = "aarch64-apple-darwin";
-          mkPackage = { pkgs, ... }: package:
-            let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa;
-            in package // {
-              buildInputs = [ Cocoa ];
-              NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
-            };
         };
       };