diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index ffe52212bb..51e1571206 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -59,6 +59,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import javax.mail.AuthenticationFailedException;
 import javax.mail.Folder;
@@ -74,6 +75,7 @@ public class FragmentQuickSetup extends FragmentBase {
     private EditText etEmail;
     private TextInputLayout tilPassword;
     private TextView tvCharacters;
+    private TextView tvOutlookModern;
     private Button btnCheck;
     private ContentLoadingProgressBar pbCheck;
     private TextView tvPatience;
@@ -146,6 +148,7 @@ public class FragmentQuickSetup extends FragmentBase {
         etEmail = view.findViewById(R.id.etEmail);
         tilPassword = view.findViewById(R.id.tilPassword);
         tvCharacters = view.findViewById(R.id.tvCharacters);
+        tvOutlookModern = view.findViewById(R.id.tvOutlookModern);
         btnCheck = view.findViewById(R.id.btnCheck);
         pbCheck = view.findViewById(R.id.pbCheck);
         tvPatience = view.findViewById(R.id.tvPatience);
@@ -195,6 +198,26 @@ public class FragmentQuickSetup extends FragmentBase {
             }
         });
 
+        etEmail.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // Do nothing
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // Do nothing
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String email = s.toString().toLowerCase(Locale.ROOT);
+                boolean outlook = (email.contains("@outlook.") ||
+                        email.contains("@hotmail.") ||
+                        email.contains("@live."));
+                tvOutlookModern.setVisibility(outlook ? View.VISIBLE : View.GONE);
+            }
+        });
         tilPassword.setHintEnabled(false);
 
         tilPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -274,6 +297,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
         // Initialize
         tvCharacters.setVisibility(View.GONE);
+        tvOutlookModern.setVisibility(View.GONE);
         tvImapFingerprint.setText(null);
         tvSmtpFingerprint.setText(null);
         pbCheck.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index d36c88ac29..1cd9bed849 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -123,6 +123,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCharacters" />
 
+        <TextView
+            android:id="@+id/tvOutlookModern"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_outlook_modern"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?colorWarning"
+            android:textStyle="bold|italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvCaseSensitiveHint" />
+
         <Button
             android:id="@+id/btnCheck"
             android:layout_width="wrap_content"
@@ -133,7 +145,7 @@
             android:tag="disable"
             android:text="@string/title_check"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCaseSensitiveHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvOutlookModern" />
 
         <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbCheck"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec399ed5be..6468f4dbf8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -248,6 +248,7 @@
     <string name="title_setup_gmail_login">If Chrome is signed in to an account, a new account can only be added through Android. This can be avoided by logging out of Chrome via the Chrome sync settings.</string>
     <string name="title_setup_gmail_max">In case of the error message \"You\'re signed in to the maximum number of accounts\", you need to log out the browser from all Google accounts.</string>
     <string name="title_setup_outlook_hint">In the case of an alias address, the Office 365 wizard should probably be used.</string>
+    <string name="title_setup_outlook_modern">Due to changes in Microsoft\'s security policies, from September 16, 2024, only the Outlook/Hotmail/Live wizard will work.</string>
     <string name="title_setup_gmail_on_device">Why do I need to select an on-device account?</string>
     <string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string>
     <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>