diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 7afd6fcbe..1116d7bae 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -283,7 +283,7 @@ export class MessageModel extends AbstractModel {
 			body.classList.toggle('html', 1);
 			body.classList.toggle('plain', 0);
 
-			if (SettingsUserStore.showImages()) {
+			if (SettingsUserStore.showImages() && !this.isSpam() && FolderUserStore.spamFolder() != this.folder) {
 				this.showExternalImages();
 			}