From 8cf8502485c3d2f7e7f98fd492ffcded4d4bd596 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 10 Jun 2022 01:06:17 +0200
Subject: [PATCH] Filter more message flags/keywords/tags

---
 dev/Model/Message.js                          | 24 +++++++++++++++----
 .../libraries/RainLoop/Actions/Response.php   |  5 ++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 0e33d9995..362a06e3f 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -36,23 +36,37 @@ const
 	},
 
 	ignoredTags = [
+		// rfc5788
 		'$forwarded',
 		'$mdnsent',
-		'$readreceipt',
+		'$submitpending',
+		'$submitted',
+		// rfc9051
+		'$junk',
+		'$notjunk',
+		'$phishing',
 		// Mailo
 		'sent',
 		// KMail
+		'$attachment',
+		'$encrypted',
+		'$error',
+		'$ignored',
+		'$invitation',
+		'$queued',
+		'$replied',
 		'$sent',
 		'$signed',
-		'$error',
-		'$queued',
+		'$todo',
+		'$watched',
 		// GMail
 		'$replied',
 		'$attachment',
 		'$notphishing',
-		'$phishing',
 		'junk',
-		'nonjunk'
+		'nonjunk',
+		// Others
+		'$readreceipt'
 	],
 
 	toggleTag = (message, keyword) => {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
index b5582f010..b3b28ff54 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
@@ -199,6 +199,11 @@ trait Response
 			if (false !== $key) {
 				$mResult['Flags'][$key] = '$mdnsent';
 			}
+			// KMail
+			$key = \array_search('$replied', $mResult['Flags']);
+			if (false !== $key) {
+				$mResult['Flags'][$key] = '\\answered';
+			}
 
 			$mResult['Flags'] = \array_unique($mResult['Flags']);