diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 3836814..3d39c8c 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -530,6 +530,8 @@ define(function(require) {
                         decrypted = err.errMsg;
                     }
 
+                    // set encrypted flag
+                    email.encrypted = true;
                     setBodyAndContinue(decrypted);
                 });
             });
diff --git a/src/tpl/read.html b/src/tpl/read.html
index ad28af0..3ce8442 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -6,7 +6,7 @@
 
 <div class="view-read" ng-controller="ReadCtrl">
   <div class="headers">
-    <p class="subject" ng-click="state.read.toggle(false)">{{(state.mailList.selected.subject || 'No subject') + ((state.mailList.selected.from[0].secure === false) ? ' (unencrypted)' : '')}}</p>
+    <p class="subject" ng-click="state.read.toggle(false)">{{(state.mailList.selected.subject || 'No subject') + ((!state.mailList.selected.encrypted) ? ' (not encrypted)' : '')}}</p>
     <p class="date">{{state.mailList.selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}</p>
     <p class="address">
       From: <span ng-repeat="u in state.mailList.selected.from" class="label" ng-class="{'label-primary': u.secure === false}" data-icon-append="{{(u.secure === false) ? '&#xe001;' : (u.secure === true) ? '&#xe009;' : ''}}" ng-mouseover="getFingerprint(u.address)" popover="#fingerprint-info">{{u.name || u.address}}</span>