diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index f268585..8daa37f 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -8,7 +8,7 @@
     <li ng-class="{'mail-list-active': email === selected, 'mail-list-attachment': email.attachments !== undefined && email.attachments.length > 0, 'mail-list-unread': email.unread, 'mail-list-replied': email.answered}" ng-click="select(email)" ng-repeat="email in emails">
       <h3>{{email.from[0].name || email.from[0].address}}</h3>
       <div class="head">
-        <p class="subject">{{email.subject}}</p>
+        <p class="subject">{{email.subject || 'No subject'}}</p>
         <time>{{email.sentDate | date:'mediumDate'}}</time>
       </div>
       <p class="body">{{email.body}}</p>
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 727d0f2..4242a1c 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -6,7 +6,7 @@
 
 <div class="view-read">
   <div class="headers">
-    <p class="subject">{{selected.subject}}</p>
+    <p class="subject">{{selected.subject || 'No subject'}}</p>
     <p class="date">{{selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}</p>
     <p class="address">From: <span class="label">{{selected.from[0].name || selected.from[0].address}}</span></p>
     <p class="address">To: <span class="label" ng-repeat="t in selected.to">{{t.address}} </span></p>