From fe543767c67f09275de868184d884fe9ae74e9ed Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 20 Feb 2023 11:01:01 +0100
Subject: [PATCH] Updated text

---
 app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 ++-
 app/src/main/res/values/strings.xml                    | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 8f9d155a63..9d059465ee 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -679,7 +679,8 @@ public class ApplicationEx extends Application
         } else if (version < 2029) {
             if (!prefs.contains("plain_only_reply"))
                 editor.putBoolean("plain_only_reply", true);
-        }
+        } else if (version < 2046)
+            editor.remove("message_junk");
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
             editor.remove("background_service");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f005ce23e..0efea2a660 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2040,7 +2040,11 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; Swipe right to archive (if available); The swipe actions can be configured in the account settings</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages; Hold and swipe up or down to select more messages</string>
-    <string name="title_hint_message_junk">These messages are in the spam folder of the email server. Obviously, the app cannot prevent spam messages from being sent to you.</string>
+    <string name="title_hint_message_junk">
+        An email client basically displays messages on an email server.
+        An email server is responsible for filtering spam, not an email client.
+        If you receive a lot of spam, please contact your email provider and don\'t blame the app!
+    </string>
     <string name="title_hint_important">Important</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection, the device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_hint_sync_note">By default, not all messages will be downloaded to limit storage space and battery and data usage. You can change this by long pressing a folder in the folder list and selecting \'Synchronize more\'.</string>