diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 52e9bde..09507f9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -23,7 +23,7 @@ body:
     id: problem-related
     attributes:
       label: Is your feature request related to a problem?
-      description: Wrote a clear and concise description of what the problem is.
+      description: Write a clear and concise description of what the problem is.
       placeholder: Tell us what the problem is!
       value: "I'm always frustrated when..."
   - type: checkboxes
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 3308867..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,19 +0,0 @@
-stalwart-imap v0.3.1
-================================
-- Fix: Support for OpenLDAP password hashing schemes between curly brackets (#8). 
-- Fix: Add CA certificates to Docker runtime (#5).
-
-stalwart-imap v0.3.0
-================================
-- Rewritten IMAP server to have direct access to the message store (no more IMAP proxy).
-
-stalwart-imap v0.2.0
-================================
-- ManageSieve support.
-- Fixed BODY[1] bug.
-- Added UTF8=ACCEPT (RFC 6855) support.
-
-stalwart-imap v0.1.0
-================================
-- Initial release.
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..86c894c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,53 @@
+# Change Log
+
+All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.3.2] - 2023-07-28
+
+### Added
+- Sender and recipient address rewriting using regular expressions and sieve scripts.
+- Subaddressing and catch-all addresses using regular expressions (#10).
+ 
+### Changed
+- Added CLI to Docker container (#19).
+ 
+### Fixed
+- Workaround for a bug in `sqlx` that caused SQL time-outs (#15).
+- Support for ED25519 certificates in PEM files (#20). 
+- Better handling of concurrent IMAP UID map modifications (#17).
+- LDAP domain lookups from SMTP rules.
+
+## [0.3.1] - 2023-07-22
+
+### Added
+ 
+### Changed
+ 
+### Fixed
+- Support for OpenLDAP password hashing schemes between curly brackets (#8). 
+- Add CA certificates to Docker runtime (#5).
+
+## [0.3.0] - 2023-07-16
+
+### Added
+
+### Changed
+- Rewritten IMAP server to have direct access to the message store (no more IMAP proxy).
+ 
+### Fixed
+
+## [0.2.0] - 2022-10-31
+
+### Added
+- ManageSieve support.
+- Added UTF8=ACCEPT (RFC 6855) support.
+
+### Changed
+ 
+### Fixed
+- Fixed BODY[1] bug.
+
+## [0.1.0] - 2022-09-15
+
+Initial release.
+
diff --git a/Cargo.lock b/Cargo.lock
index e515283..7ae0949 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1029,6 +1029,7 @@ dependencies = [
  "argon2",
  "async-trait",
  "bb8",
+ "futures",
  "ldap3",
  "lru-cache",
  "mail-builder",
@@ -1039,6 +1040,7 @@ dependencies = [
  "password-hash 0.5.0",
  "pbkdf2 0.12.2",
  "pwhash",
+ "regex",
  "rustls 0.21.5",
  "scrypt",
  "sha1",
@@ -1887,7 +1889,7 @@ dependencies = [
 
 [[package]]
 name = "imap"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "ahash 0.8.3",
  "dashmap",
@@ -2051,7 +2053,7 @@ dependencies = [
 
 [[package]]
 name = "jmap"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "aes-gcm",
  "aes-gcm-siv",
@@ -3991,7 +3993,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "smtp"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "ahash 0.8.3",
  "blake3",
@@ -4291,7 +4293,7 @@ dependencies = [
 
 [[package]]
 name = "stalwart-imap"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "directory",
  "imap",
@@ -4308,7 +4310,7 @@ dependencies = [
 
 [[package]]
 name = "stalwart-install"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "base64 0.21.2",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index ca2ae31..3326475 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art/imap"
 keywords = ["imap", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 resolver = "2"
 
diff --git a/Dockerfile b/Dockerfile
index f984913..98def6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,8 @@ RUN useradd stalwart-mail -s /sbin/nologin -M
 RUN mkdir -p /opt/stalwart-mail
 RUN chown stalwart-mail:stalwart-mail /opt/stalwart-mail
 
-EXPOSE	8080 25 587 465 8686 143 993 4190
+VOLUME [ "/opt/stalwart-mail" ]
+
+EXPOSE	8080 25 587 465 143 993 4190
 
 ENTRYPOINT ["/bin/sh", "/usr/local/bin/entrypoint.sh"]
diff --git a/main b/main
index ee9d85a..9ff09c9 160000
--- a/main
+++ b/main
@@ -1 +1 @@
-Subproject commit ee9d85a3182f129702ddd5caf4f072035b969cad
+Subproject commit 9ff09c98bade0327bf114110890dacff601e7dd2