diff --git a/SETUP.md b/SETUP.md
index 6b58bc7a78..a48ea61dd1 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -28,8 +28,8 @@ After reviewing the system folder selection you can add the account by tapping *
 
 If your provider is not in the list 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 host name and port number,
-else check the setup instructions of your provider for the right IMAP host name, port number and protocol (SSL/TLS or STARTTLS).
+If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number,
+else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS).
 For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts).
 
 
@@ -41,8 +41,8 @@ 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 host name and port number,
-else check the setup instructions of your provider for the right SMTP host name, port number and protocol (SSL/TLS or STARTTLS).
+If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number,
+else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS).
 
 See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases.
 
@@ -53,7 +53,7 @@ If you want to lookup email addresses, have contact photos shown, etc, you'll ne
 Just tap *Grant permissions* and select *Allow*.
 
 
-## Setup battery optimizations - to continuously receive email
+## 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.