From 11c5b0e8f1ae5b0dfe05f86f804f0ad1bf8b6d81 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 3 Feb 2023 08:39:09 +0100
Subject: [PATCH] Resolve bug in images whitelist #201

---
 dev/Model/Message.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 825bf07a8..177a8029f 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -292,10 +292,12 @@ export class MessageModel extends AbstractModel {
 				}
 				if ('match' === SettingsUserStore.viewImages()) {
 					let regex = SettingsUserStore.viewImagesWhitelist()
+						.trim()
 						.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&')
-						.replace(/[\s\S,;:]+/g, '|')
+						.replace(/[\s\r\n,;:]+/g, '|')
 						.replace(/\|+/g, '|');
 					if (regex.length) {
+						console.log('whitelist images = '+regex);
 						regex = new RegExp(regex);
 						this.showExternalImages(
 							(this.from[0]?.email.match(regex)/* || this.sender[0]?.email.match(regex)*/) ? null : regex