Don't clone message for viewing, so that there is instant interaction with messagelist item

dev/Common/Folders.js

@@ -129,7 +129,7 @@ folderInformation = (folder, list) => {
 						const oldHash = folderFromCache.hash,
 							unreadCountChange = (folderFromCache.unreadEmails() !== result.unreadEmails);
 
-//							folderFromCache.revivePropertiesFromJson(result);
+//						folderFromCache.revivePropertiesFromJson(result);
 						folderFromCache.expires = Date.now();
 						folderFromCache.uidNext = result.uidNext;
 						folderFromCache.hash = result.hash;
@@ -151,9 +151,11 @@ folderInformation = (folder, list) => {
 						if (!oldHash || unreadCountChange || result.hash !== oldHash) {
 							if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
+/*
 							} else if (getFolderInboxName() === folderFromCache.fullName) {
 //								Remote.messageList(null, {folder: getFolderFromCacheList(getFolderInboxName())}, true);
 								Remote.messageList(null, {folder: getFolderInboxName()}, true);
+*/
 							}
 						}
 					}

dev/Common/UtilsUser.js

@@ -258,36 +258,23 @@ populateMessageBody = (oMessage, popup) => {
 				}
 			} else {
 				let json = oData?.Result;
-
-				if (
-					json &&
-					MessageModel.validJson(json) &&
-					oMessage.folder === json.folder
+				if (json
+				 && MessageModel.validJson(json)
+				 && oMessage.hash === json.hash
+//				 && oMessage.folder === json.folder
+//				 && oMessage.uid == json.uid
+				 && oMessage.revivePropertiesFromJson(json)
 				) {
-					const threads = oMessage.threads(),
-						isNew = !popup && oMessage.uid != json.uid && threads.includes(json.uid),
-						messagesDom = MessageUserStore.bodiesDom();
-					if (isNew) {
-						oMessage = MessageModel.reviveFromJson(json);
-						if (oMessage) {
-							oMessage.threads(threads);
-							MessageFlagsCache.initMessage(oMessage);
-
-							// Set clone
-							oMessage = MessageModel.fromMessageListItem(oMessage);
-						}
-						MessageUserStore.message(oMessage);
-					}
-
-					if (oMessage && oMessage.uid == json.uid) {
-						popup || MessageUserStore.error('');
 /*
-						if (bCached) {
-							delete json.flags;
-						}
+					if (bCached) {
+						delete json.flags;
+					}
 */
-						isNew || oMessage.revivePropertiesFromJson(json);
-
+					if (popup) {
+						oMessage.viewPopupMessage();
+					} else {
+						MessageUserStore.error('');
+						const messagesDom = MessageUserStore.bodiesDom();
 						if (messagesDom) {
 							let id = 'rl-msg-' + oMessage.hash.replace(/[^a-zA-Z0-9]/g, ''),
 								body = elementById(id);
@@ -313,42 +300,16 @@ populateMessageBody = (oMessage, popup) => {
 
 							messagesDom.append(body);
 
-							popup || (oMessage.body.hidden = false);
+							oMessage.body.hidden = false;
 						}
-						popup && oMessage.viewPopupMessage();
+					}
 
-						MessageFlagsCache.initMessage(oMessage);
-						if (oMessage.isUnseen()) {
-							MessageUserStore.MessageSeenTimer = setTimeout(
-								() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
-								SettingsUserStore.messageReadDelay() * 1000 // seconds
-							);
-						}
-
-						if (isNew) {
-							let selectedMessage = MessagelistUserStore.selectedMessage();
-							if (
-								selectedMessage &&
-								(oMessage.folder !== selectedMessage.folder || oMessage.uid != selectedMessage.uid)
-							) {
-								MessagelistUserStore.selectedMessage(null);
-								if (1 === MessagelistUserStore.length) {
-									MessagelistUserStore.focusedMessage(null);
-								}
-							} else if (!selectedMessage) {
-								selectedMessage = MessagelistUserStore.find(
-									subMessage =>
-										subMessage &&
-										subMessage.folder === oMessage.folder &&
-										subMessage.uid == oMessage.uid
-								);
-
-								if (selectedMessage) {
-									MessagelistUserStore.selectedMessage(selectedMessage);
-									MessagelistUserStore.focusedMessage(selectedMessage);
-								}
-							}
-						}
+					MessageFlagsCache.initMessage(oMessage);
+					if (oMessage.isUnseen()) {
+						MessageUserStore.MessageSeenTimer = setTimeout(
+							() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
+							SettingsUserStore.messageReadDelay() * 1000 // seconds
+						);
 					}
 				}
 			}

dev/Model/Message.js

@@ -5,7 +5,7 @@ import { i18n } from 'Common/Translator';
 
 import { doc, SettingsGet } from 'Common/Globals';
 import { encodeHtml, plainToHtml, htmlToPlain, cleanHtml } from 'Common/Html';
-import { isFunction, forEachObjectEntry } from 'Common/Utils';
+import { forEachObjectEntry } from 'Common/Utils';
 import { serverRequestRaw, proxy } from 'Common/Links';
 import { addObservablesTo, addComputablesTo } from 'External/ko';
 
@@ -212,6 +212,7 @@ export class MessageModel extends AbstractModel {
 //			this.attachments(AttachmentCollectionModel.reviveFromJson(json.attachments, this.foundCIDs));
 
 			this.computeSenderEmail();
+			return true;
 		}
 	}
 
@@ -353,9 +354,7 @@ export class MessageModel extends AbstractModel {
 		);
 		sdoc.close();
 
-		if (print) {
-			setTimeout(() => win.print(), 100);
-		}
+		print && setTimeout(() => win.print(), 100);
 	}
 
 	/**
@@ -377,24 +376,21 @@ export class MessageModel extends AbstractModel {
 	}
 
 	/**
-	 * @param {MessageModel} message
 	 * @returns {MessageModel}
-	 */
-	static fromMessageListItem(message) {
+	 *//*
+	clone() {
 		let self = new MessageModel();
-		if (message) {
-			// Clone message values
-			forEachObjectEntry(message, (key, value) => {
-				if (ko.isObservable(value)) {
-					ko.isComputed(value) || self[key](value());
-				} else if (!isFunction(value)) {
-					self[key] = value;
-				}
-			});
-			self.computeSenderEmail();
-		}
+		// Clone message values
+		forEachObjectEntry(this, (key, value) => {
+			if (ko.isObservable(value)) {
+				ko.isComputed(value) || self[key](value());
+			} else if (!isFunction(value)) {
+				self[key] = value;
+			}
+		});
+		self.computeSenderEmail();
 		return self;
-	}
+	}*/
 
 	showExternalImages(regex) {
 		const body = this.body;

dev/Model/MessageCollection.js

@@ -1,5 +1,6 @@
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { MessageModel } from 'Model/Message';
+import { MessageUserStore } from 'Stores/User/Message';
 
 import {
 	MessageFlagsCache
@@ -31,8 +32,11 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 * @returns {MessageCollectionModel}
 	 */
 	static reviveFromJson(object, cached) {
+		let msg = MessageUserStore.message();
 		return super.reviveFromJson(object, message => {
-			message = MessageModel.reviveFromJson(message);
+			// If message is currently viewed, use that.
+			// Maybe then use msg.revivePropertiesFromJson(message) ?
+			message = (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message);
 			if (message) {
 				message.deleted(false);
 				cached ? MessageFlagsCache.initMessage(message) : MessageFlagsCache.store(message);

dev/View/User/MailBox/MessageList.js

@@ -235,7 +235,8 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.selector.on('ItemSelect', message => {
 			if (message) {
-				populateMessageBody(MessageModel.fromMessageListItem(message));
+//				populateMessageBody(message.clone());
+				populateMessageBody(message);
 			} else {
 				MessageUserStore.message(null);
 			}