diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 692f82000..2a01115c8 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -301,10 +301,14 @@ populateMessageBody = (oMessage, popup) => {
 				} else {
 					let json = oData?.Result;
 					if (json
-					 && oMessage.hash === json.hash
-//					 && oMessage.folder === json.folder
-//					 && oMessage.uid == json.uid
-					 && oMessage.revivePropertiesFromJson(json)
+						&& ((
+								oMessage.hash && oMessage.hash === json.hash
+							) || (
+								!oMessage.hash
+								&& oMessage.folder === json.folder
+								&& oMessage.uid == json.uid)
+						)
+						&& oMessage.revivePropertiesFromJson(json)
 					) {
 /*
 						if (bCached) {