diff --git a/src/tpl/read.html b/src/tpl/read.html
index 99f4caf..d982af1 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -35,7 +35,7 @@
     </div>
   </div><!--/.ng-switch-->
 
-  <div class="body" ng-switch="state.mailList.selected === undefined || state.mailList.selected.encrypted === false || (state.mailList.selected.encrypted === true && state.mailList.selected.decrypted === true)">
+  <div class="body" ng-switch="state.mailList.selected === undefined || (state.mailList.selected.encrypted === false && state.mailList.selected.body !== undefined) || (state.mailList.selected.encrypted === true && state.mailList.selected.decrypted === true)">
     <div ng-switch-when="true">
       <!-- Render lines of a text-email in divs for easier styling -->
       <div class="line" ng-repeat="line in state.mailList.selected.body.split('\n') track by $index" ng-class="{'empty-line': lineEmpty(line)}">{{line}}<br></div>