diff --git a/dev/App/User.js b/dev/App/User.js
index 8094d4268..59af22283 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -239,8 +239,8 @@ export class AppUser extends AbstractApp {
 								MessageFlagsCache.clearFolder(folderFromCache.fullName);
 							}
 
-							if (result.Flags.length) {
-								result.Flags.forEach(message =>
+							if (result.MessagesFlags.length) {
+								result.MessagesFlags.forEach(message =>
 									MessageFlagsCache.setFor(folderFromCache.fullName, message.Uid.toString(), message.Flags)
 								);
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
index cee0a0c9d..e93557d84 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
@@ -31,6 +31,7 @@ class FolderInformation implements \JsonSerializable
 
 	/**
 	 * @var array
+	 * Message flags
 	 */
 	public $Flags = array();
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index be99c3c54..9fa73b50f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -424,8 +424,6 @@ trait Folders
 				(int) $this->GetActionParam('UidNext', 0),
 				new \MailSo\Imap\SequenceSet($this->GetActionParam('FlagsUids', []))
 			);
-			$aInboxInformation['Flags'] = $aInboxInformation['MessagesFlags'];
-			unset($aInboxInformation['MessagesFlags']);
 			return $this->DefaultResponse(__FUNCTION__, $aInboxInformation);
 		}
 		catch (\Throwable $oException)