From 7cbc185d93079758026abe96877dca4a6cfb8495 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Thu, 7 Nov 2013 20:00:36 +0100
Subject: [PATCH] [WO-72] fix focus directive when opening writer mode to focus
 on the correct input

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

diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index 417effb..d2ad26c 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -209,7 +209,7 @@ define(function(require) {
                     if (value === true) {
                         $timeout(function() {
                             element[0].focus();
-                        });
+                        }, 100);
                     }
                 });
             }
diff --git a/src/tpl/write.html b/src/tpl/write.html
index 4bc2a5e..50cb0db 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -9,7 +9,7 @@
       <div class="headers">
         <p>
           <span>To:</span>
-          <input type="email" ng-model="to" ng-change="verifyTo()" ng-class="{'label': toSecure === true, 'label label-primary': toSecure === false}" tabindex="1" focus-me="writerOpen" auto-size="to" spellcheck="false">
+          <input type="email" ng-model="to" ng-change="verifyTo()" ng-class="{'label': toSecure === true, 'label label-primary': toSecure === false}" tabindex="1" focus-me="writerOpen && !writerReply" auto-size="to" spellcheck="false">
         </p>
         <p>
           <span>Cc:</span>
@@ -27,7 +27,7 @@
       </div><!--/.subject-box-->
 
       <div class="body">
-        <p ng-model="body" contentEditable="true" ng-change="updatePreview()" tabindex="4"></p>
+        <p ng-model="body" contentEditable="true" ng-change="updatePreview()" tabindex="4" focus-me="writerOpen && writerReply"></p>
 
         <div class="encrypt-preview">
           <p>-----BEGIN ENCRYPTED PREVIEW-----<br>{{ciphertextPreview}}<br>-----END ENCRYPTED PREVIEW-----</p>