From 1d982f3306e285fed6ccbf1d372c5804b75bfd64 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 13 Sep 2022 23:00:26 +0200
Subject: [PATCH] Improvement for #518

---
 dev/Stores/User/Messagelist.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 2f47258d0..b9d46b3a6 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -193,17 +193,18 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 	}
 
 	MessagelistUserStore.loading(true);
-	MessagelistUserStore.error('');
 	Remote.messageList(
 		(iError, oData, bCached) => {
+			let error = '';
 			if (iError) {
+				error = getNotification(iError);
 				if (Notification.RequestAborted !== iError) {
 					MessagelistUserStore([]);
 				}
-				MessagelistUserStore.error(getNotification(iError));
 			} else {
 				const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached);
 				if (collection) {
+					error = '';
 					let unreadCountChange = false;
 
 					const
@@ -273,8 +274,9 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 				} else {
 					MessagelistUserStore.count(0);
 					MessagelistUserStore([]);
-					MessagelistUserStore.error(getNotification(Notification.CantGetMessageList));
+					error = getNotification(Notification.CantGetMessageList);
 				}
+				MessagelistUserStore.error(error);
 			}
 			MessagelistUserStore.loading(false);
 		},