diff --git a/src/tpl/read.html b/src/tpl/read.html
index 17af8a9..da231f7 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -8,11 +8,15 @@
   <div class="headers">
     <p class="subject" ng-click="state.read.toggle(false)">{{state.mailList.selected.subject || 'No subject'}}</p>
     <p class="date">{{state.mailList.selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}</p>
-    <p class="address">From: <span class="label" data-icon-append="&#xe009;">{{state.mailList.selected.from[0].name || state.mailList.selected.from[0].address}}</span></p>
-    <p class="address">To: <span class="label" data-icon-append="&#xe009;" ng-repeat="t in state.mailList.selected.to">{{t.address}} </span></p>
+    <p class="address">
+      From: <span class="label" data-icon-append="&#xe009;" ng-repeat="f in state.mailList.selected.from">{{f.name || f.address}}</span>
+    </p>
+    <p class="address">
+      To: <span class="label" data-icon-append="&#xe009;" ng-repeat="t in state.mailList.selected.to">{{t.address}}</span>
+    </p>
     <div ng-switch="state.mailList.selected.cc !== undefined">
       <p class="address" ng-switch-when="true">
-        CC: <span class="label" ng-repeat="t in state.mailList.selected.cc">{{t.address}} </span>
+        CC: <span class="label" ng-repeat="t in state.mailList.selected.cc">{{t.address}}</span>
       </p>
     </div>
   </div><!--/.headers-->