From 2c40475bfa7cd4a8b528c9c6becf4b36dac15079 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 5 Nov 2020 10:38:17 +0100
Subject: [PATCH] Bugfix: failed to set message data from dom

---
 dev/Model/Message.js       | 1 -
 dev/Stores/User/Message.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index bf148b4d7..c1107b546 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -476,7 +476,6 @@ class MessageModel extends AbstractModel {
 					node.loading = 'lazy';
 				}
 				node.src = node.getAttribute(attr);
-				node.removeAttribute('data-loaded');
 			});
 
 			attr = this.externalProxy ? 'data-x-additional-style-url' : 'data-x-style-url';
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 407afcced..906d856b3 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -494,8 +494,8 @@ class MessageUserStore {
 					const textBody = document.getElementById(id);
 					if (textBody) {
 						textBody.rlCacheCount = ++iMessageBodyCacheCount;
-						message.fetchDataFromDom();
 						message.body = textBody;
+						message.fetchDataFromDom();
 					} else {
 						let isHtml = false;
 						if (json.Html) {