diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d6687..0ea49ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added 3 new cargo features:
+  - `cmds-pgp`: enables the commands PGP backend (enabled by default, same behaviour as before)
+  - `gpg`: enables the GPG backend (requires the `gpgme` lib on the system)
+  - `native-pgp`: enables the native PGP backend
+- Added account configuration `pgp` to configure the way PGP operations are performed.
+
+### Removed
+
+- Removed account configuration `email-writing-encrypt-cmd`.
+- Removed account configuration `email-reading-decrypt-cmd`.
+- Removed account configuration `email-writing-sign-cmd`.
+- Removed account configuration `email-reading-verify-cmd`.
+
 ## [0.8.4] - 2023-07-18
 
 ### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index 94f4444..b1d6033 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2506,7 +2506,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-email"
 version = "0.14.1-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "advisory-lock",
  "ammonia",
@@ -2553,7 +2553,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-email-tpl"
 version = "0.3.2-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "async-recursion",
  "chumsky 0.9.0",
@@ -2574,7 +2574,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-keyring"
 version = "0.0.6-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "keyring",
  "log",
@@ -2584,7 +2584,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-oauth2"
 version = "0.0.5-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "log",
  "oauth2",
@@ -2597,7 +2597,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-pgp"
 version = "0.0.1"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "async-recursion",
  "futures",
@@ -2617,7 +2617,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-process"
 version = "0.0.6-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "log",
  "thiserror",
@@ -2627,7 +2627,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-secret"
 version = "0.0.6-beta"
-source = "git+https://git.sr.ht/~soywod/pimalaya#8ce32f0f7dbf98aaaf7d6a69431816cfd76abb64"
+source = "git+https://git.sr.ht/~soywod/pimalaya#b75297ae474a231eb13c9bd7c04b5dc877026948"
 dependencies = [
  "log",
  "pimalaya-keyring",