Updated setup instructions

app/src/main/assets/SETUP.md

@@ -14,50 +14,50 @@ An internet connection is required to set up accounts and identities.
 
 Just select the appropriate provider or *Other provider* and enter your name, email address and password and tap *Check*.
 
-This will work for most major email providers.
+This will work for most email providers.
 
-If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions.
+If the quick setup doesn't work, you'll need to set up an account and an identity manually, see below for instructions.
 
 
 ## Set up account - to receive email
 
-To add an account, tap the *Accounts* button and tap the 'plus' button at the bottom and select IMAP (or POP3).
+To add an account, tap *Manual setup and more options*, tap *Accounts* and tap the 'plus' button at the bottom and select IMAP (or POP3).
 Select a provider from the list, enter the username, which is mostly your email address and enter your password.
 Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders.
 After reviewing the system folder selection you can add the account by tapping *Save*.
 
-If your provider is not in the list of providers, select *Custom*.
+If your provider is not in the list of providers, there are thousands of providers, select *Custom*.
 Enter the domain name, for example *gmail.com* and tap *Get settings*.
-If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number,
+If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the host name and port number,
-else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS).
+else check the setup instructions of your provider for the right IMAP host name, port number and encryption protocol (SSL/TLS or STARTTLS).
 For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts).
 
 
 ## Set up identity - to send email
 
-Similarly, to add an identity, tap the *Identities* button and tap the 'plus' button at the bottom.
+Similarly, to add an identity, tap *Manual setup and more options*, tap *Identities* and tap the 'plus' button at the bottom.
 Enter the name you want to appear in the from address of the emails you send and select a linked account.
 Tap *Save* to add the identity.
 
 If the account was configured manually, you likely need to configure the identity manually too.
 Enter the domain name, for example *gmail.com* and tap *Get settings*.
-If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number,
+If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the host name and port number,
-else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS).
+else check the setup instructions of your provider for the right SMTP host name, port number and encryption protocol (SSL/TLS or STARTTLS).
 
 See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases.
 
 
 ## Grant permissions - to access contact information
 
-If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail.
+If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant permission to read contact information to FairEmail.
-Just tap *Grant permissions* and select *Allow*.
+Just tap *Grant* and select *Allow*.
 
 
 ## Setup battery optimizations - to continuously receive emails
 
 On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage.
 If you want to receive new emails without delays, you should disable battery optimizations for FairEmail.
-Tap *Disable battery optimizations* and follow the instructions.
+Tap *Manage* and follow the instructions.
 
 
 ## Questions or problems