From 4b638a0deed3662c8d96b73ce03369b639ca2aa9 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 13 Jan 2014 22:43:43 +0100
Subject: [PATCH] reading and writing to multiple recipients works

---
 src/js/controller/read.js  | 2 ++
 src/js/controller/write.js | 4 +++-
 src/tpl/read.html          | 2 +-
 src/tpl/write.html         | 6 ------
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/js/controller/read.js b/src/js/controller/read.js
index b93d21b..90aaac8 100644
--- a/src/js/controller/read.js
+++ b/src/js/controller/read.js
@@ -53,6 +53,8 @@ define(function(require) {
             mail.from.forEach(checkPublicKey);
             // display recipient security status
             mail.to.forEach(checkPublicKey);
+            // display recipient security status
+            Array.isArray(mail.cc) && mail.cc.forEach(checkPublicKey);
         });
 
         function checkPublicKey(user) {
diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index 8818522..691afc4 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -62,7 +62,9 @@ define(function(require) {
 
             $scope.writerTitle = 'Reply';
             // fill recipient field
-            $scope.to[0].address = re.from[0].address;
+            $scope.to.unshift({
+                address: re.from[0].address
+            });
             // fill subject
             $scope.subject = 'Re: ' + ((re.subject) ? re.subject.replace('Re: ', '') : '');
 
diff --git a/src/tpl/read.html b/src/tpl/read.html
index bcaefe1..ca2dbf9 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -16,7 +16,7 @@
     </p>
     <div ng-switch="state.mailList.selected.cc !== undefined">
       <p class="address" ng-switch-when="true">
-        CC: <span ng-repeat="u in state.mailList.selected.cc" 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>
+        Cc: <span ng-repeat="u in state.mailList.selected.cc" 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>
       </p>
     </div>
   </div><!--/.headers-->
diff --git a/src/tpl/write.html b/src/tpl/write.html
index 99e33bc..9f76f5f 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -19,12 +19,6 @@
             <input id="cc{{$index}}" value="{{recipient.address}}" ng-model="recipient.address" ng-trim="false" ng-class="{'label': recipient.secure === true, 'label label-primary': recipient.secure === false && recipient.valid !== true}" auto-size="recipient.address" spellcheck="false" ng-change="onAddressUpdate(cc, $index)" address-input="cc" tabindex="1">
           </span>
         </p>
-        <p>
-          <span>Bcc:</span>
-          <span ng-repeat="recipient in bcc track by $index">
-            <input id="bcc{{$index}}" value="{{recipient.address}}" ng-model="recipient.address" ng-trim="false" ng-class="{'label': recipient.secure === true, 'label label-primary': recipient.secure === false && recipient.valid !== true}" auto-size="recipient.address" spellcheck="false" ng-change="onAddressUpdate(bcc, $index)" address-input="bcc" tabindex="1">
-          </span>
-        </p>
       </div><!--/.address-headers-->
 
       <div class="subject-box">