diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcf94f1..3643ddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+* Fixed long subject decoding issue [#380].
+
 ## [0.6.0] - 2022-10-10
 
 ### Changed
@@ -22,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * This repository only contains the CLI source code (it was not
 	possible to move it to sourcehut because of cross platform builds)
 
+* [**BREAKING**] Renamed `-m|--mailbox` to `-f|--folder`
+
 * [**BREAKING**] Refactored config system [#344].
 
   The configuration has been rethought in order to be more intuitive
@@ -569,3 +575,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#340]: https://github.com/soywod/himalaya/issues/340
 [#344]: https://github.com/soywod/himalaya/issues/344
 [#346]: https://github.com/soywod/himalaya/issues/346
+[#380]: https://github.com/soywod/himalaya/issues/380
diff --git a/Cargo.lock b/Cargo.lock
index 5bf988b..d4bc307 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "ahash"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
+dependencies = [
+ "const-random",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -127,6 +136,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "chumsky"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d02796e4586c6c41aeb68eae9bfb4558a522c35f1430c14b40136c3706e09e4"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "clap"
 version = "2.34.0"
@@ -150,6 +168,28 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "const-random"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
+dependencies = [
+ "const-random-macro",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
+dependencies = [
+ "getrandom",
+ "lazy_static",
+ "proc-macro-hack",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.5.0"
@@ -172,6 +212,12 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "darling"
 version = "0.10.2"
@@ -457,7 +503,6 @@ dependencies = [
  "native-tls",
  "notmuch",
  "regex",
- "rfc2047-decoder",
  "serde",
  "serde_json",
  "shellexpand",
@@ -474,8 +519,7 @@ dependencies = [
 [[package]]
 name = "himalaya-lib"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33465f9a8c4dd3db2838c299bc897d4c29acd56ec1713f81a4666ef800abb1e4"
+source = "git+https://git.sr.ht/~soywod/himalaya-lib?branch=develop#aa57481c133a75e555952cde98de3041c51c272d"
 dependencies = [
  "ammonia",
  "chrono",
@@ -1033,6 +1077,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.40"
@@ -1147,13 +1197,16 @@ dependencies = [
 
 [[package]]
 name = "rfc2047-decoder"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ecf2ba387f446155e26796aabb727e9ae1427dd13ac9cc21773a3fbda19d77"
+checksum = "11347d014ae34e1d367aaf9191c37bf071b161e2e1c09c8559c7717e87030e11"
 dependencies = [
  "base64",
  "charset",
+ "chumsky",
+ "memchr 2.5.0",
  "quoted_printable",
+ "thiserror",
 ]
 
 [[package]]
@@ -1408,6 +1461,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
diff --git a/Cargo.toml b/Cargo.toml
index 93c0668..f07c903 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,15 +33,14 @@ clap = { version = "2.33.3", default-features = false, features = ["suggestions"
 convert_case = "0.5.0"
 env_logger = "0.8.3"
 erased-serde = "0.3.18"
-# himalaya-lib = { version = "=0.3.1", git = "https://git.sr.ht/~soywod/himalaya-lib", branch = "develop" }
-himalaya-lib = "=0.3.1"
+himalaya-lib = { version = "=0.3.1", git = "https://git.sr.ht/~soywod/himalaya-lib", branch = "develop" }
+# himalaya-lib = "=0.3.1"
 html-escape = "0.2.9"
 lettre = { version = "=0.10.0-rc.7", features = ["serde"] }
 log = "0.4.14"
 mailparse = "0.13.6"
 native-tls = "0.2.8"
 regex = "1.5.4"
-rfc2047-decoder = "0.1.2"
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.61"
 shellexpand = "2.1.0"