diff --git a/README.md b/README.md
index 6a882084..103ecd52 100644
--- a/README.md
+++ b/README.md
@@ -559,7 +559,7 @@ At this step, you should also setup the SSL for Nginx. [Certbot](https://certbot
 
 ### Enjoy!
 
-If all of the above steps are successful, open http://app.mydomain.com/ and create your first account!
+If all the above steps are successful, open http://app.mydomain.com/ and create your first account!
 
 By default, new accounts are not premium so don't have unlimited alias. To make your account premium,
 please go to the database, table "users" and set "lifetime" column to "1" or "TRUE".
@@ -596,6 +596,12 @@ Feel free to use `virtualenv` or similar tools to isolate development environmen
 poetry install
 ```
 
+On Mac, sometimes you might need to install some other packages like
+
+```bash
+brew install pkg-config libffi openssl postgresql
+```
+
 You also need to install `gpg`, on Mac it can be done with:
 
 ```bash
diff --git a/app/email_utils.py b/app/email_utils.py
index 24a890d8..af02e114 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -840,6 +840,7 @@ def replace(msg: Message, old, new) -> Message:
         "multipart/alternative",
         "multipart/related",
         "multipart/mixed",
+        "message/rfc822"
     ):
         new_parts = []
         for part in msg.get_payload():