diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index c57777f46..e9cbccef7 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -302,6 +302,11 @@
                 message: formattedMessage
               };
             }
+            else if (part.type == 'UIxMailPartEncryptedViewer') {
+              _this.$smime = {
+                message: "THIS MAIL IS ENCRYPTED!"
+              };
+            }
             _.forEach(part.content, function(mixedPart) {
               _visit(mixedPart);
             });