diff --git a/FAQ.md b/FAQ.md
index 033bb53a85..678ccfe9d7 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -276,6 +276,8 @@ Fonts, sizes, colors, etc should be material design whenever possible.
 * [(154) Can you add favicons as contact photos?](#user-content-faq154)
 * [(155) What is a winmail.dat file?](#user-content-faq155)
 * [(156) How can I set up an Office365 account?](#user-content-faq156)
+* [(157) How can I change the default folders?](#user-content-faq157)
+
 
 [I have another question.](#user-content-support)
 
@@ -3058,6 +3060,16 @@ The procedure is documented [here](https://docs.microsoft.com/en-in/exchange/tro
 
 <br />
 
+
+<a name="faq157"></a>
+**(157) How can I change the default folders?**
+
+Go to Settings, under the *Setup accounts* section click Manage, select your account, and scroll down. Here you'll be able to select the default folder for each action (Sending, archiving, marking as spam).
+
+This is particulary useful if your email provider, for example, archives emails in the current year folder, instead of the *Archive* folder.
+
+<br />
+
 ## Support
 
 Only the latest Play store version and latest GitHub release are supported.