diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 5b77de812..eac31f777 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -115,16 +115,17 @@ export class MessageModel extends AbstractModel {
 			hasExternals: false,
 			hasTracking: false,
 
+			encrypted: false,
+
 			pgpSigned: null,
 			pgpVerified: null,
-
-			encrypted: false,
 			pgpEncrypted: null,
 			pgpDecrypted: false,
 
 			smimeSigned: null,
 			smimeVerified: null,
 			smimeEncrypted: null,
+			smimeDecrypted: false,
 
 			// rfc8621
 			id: '',
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index b62c10c5c..d5b6a5133 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -619,6 +619,13 @@ export class MailMessageView extends AbstractViewRight {
 		});
 	}
 
+	smimeDecrypt() {
+/*
+		// TODO: find private key and certificate to decrypt
+		const oMessage = currentMessage();
+*/
+	}
+
 	smimeVerify(/*self, event*/) {
 		const message = currentMessage();
 		let data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 86117a6d5..493360a4e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -490,7 +490,7 @@ class Message implements \JsonSerializable
 			'uid' => $this->Uid,
 			'hash' => \md5($this->sFolder . $this->Uid),
 			'subject' => \trim(Utils::Utf8Clear($this->sSubject)),
-			'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted,
+			'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted || $this->smimeEncrypted,
 			'messageId' => $this->sMessageId,
 			'spamScore' => $this->bIsSpam ? 100 : $this->SpamScore,
 			'spamResult' => $this->sSpamResult,
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 42ba82f36..0e3348f69 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -305,8 +305,16 @@
 							</div>
 						</div>
 
+						<div data-bind="visible: message().smimeEncrypted()">
+							<div class="smime-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
+								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
+<!-- TODO
+								<button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
+-->
+							</div>
+						</div>
 						<div data-bind="visible: message().smimeSigned()">
-							<div class="openpgp-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}">
+							<div class="smime-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}">
 								<span data-icon="✍" data-i18n="SMIME/SIGNED_MESSAGE"></span>
 								<button class="btn" data-bind="click: smimeVerify" data-i18n="CRYPTO/VERIFY"></button>
 							</div>