diff --git a/FAQ.md b/FAQ.md
index 1618b047bc..3e20755ace 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -275,6 +275,7 @@ FairEmail follows all the best practices for an email client as described in [th
 * [(142) How can I store sent messages in the inbox?](#user-content-faq142)
 * [(143) Can you add a trash folder for POP3 accounts?](#user-content-faq143)
 * [(144) How can I record voice notes?](#user-content-faq144)
+* [(145) How can I set a notification sound for an account, folder or sender?](#user-content-faq145)
 
 [I have another question.](#user-content-support)
 
@@ -2701,6 +2702,30 @@ Voice notes will automatically be attached.
 
 <br />
 
+<a name="faq145"></a>
+**(145) How can I set a notification sound for an account, folder or sender?**
+
+Account:
+
+* Enable *Separate notifications* in the advanced account settings (Setup, step 1, Manage, tap account, tap Advanced)
+* Long press the account in the account list (Setup, step 1, Manage) and select *Edit notification channel* to change the notification sound
+
+Folder:
+
+* Long press the folder in the folder list and select *Create notification channel*
+* Long press the folder in the folder list and select *Edit notification channel* to change the notification sound
+
+Sender:
+
+* Open a message from the sender and expand it
+* Expand the addresses section by tapping on the down arrow
+* Tap on the bell icon to create or edit a notification channel and to change the notification sound
+
+The order of precendence is: sender sound, folder sound, account sound and default sound.
+
+Setting a notification sound for an account, folder or sender requires Android 8 Oreo or later and is a pro feature.
+
+<br />
 
 ## Support
 
diff --git a/README.md b/README.md
index 372cc03d33..f84a229284 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq107))
-* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
+* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo) ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq145))
 * Configurable notification actions
 * Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))
 * Send messages after selected time