4 files changed, 8 insertions, 7 deletions
diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/app/js/mail_view/ui/compose_box.js
index 28f6dc83..92588310 100644
--- a/web-ui/app/js/mail_view/ui/compose_box.js
+++ b/web-ui/app/js/mail_view/ui/compose_box.js
@@ -70,7 +70,7 @@ define(
       this.after('initialize', function () {
         this.renderComposeBox();
 
-        this.select('subjectBox').focus();
+        this.select('toBox').focus();
         this.on(this.select('cancelButton'), 'click', this.showNoMessageSelected);
         this.on(document, events.mail.deleted, this.mailDeleted);
 
diff --git a/web-ui/app/js/mixins/with_mail_edit_base.js b/web-ui/app/js/mixins/with_mail_edit_base.js
index b4a2b0c8..b80a48cd 100644
--- a/web-ui/app/js/mixins/with_mail_edit_base.js
+++ b/web-ui/app/js/mixins/with_mail_edit_base.js
@@ -38,6 +38,7 @@ define(
         cancelButton: '#cancel-button',
         trashButton: '#trash-button',
         toArea: '#recipients-to-area',
+        toBox: '#recipients-to-box',
         ccArea: '#recipients-cc-area',
         bccArea: '#recipients-bcc-area',
         ccsTrigger: '#ccs-trigger',
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index 47b1e658..05498946 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -11,11 +11,11 @@
 </button>
 <div class="floatlabel">
   <label class="floatlabel" for="subject">Subject</label>
-  <input class="floatlabel" name="subject" type="text" id="subject" value="{{subject}}" placeholder="{{t 'Subject'}}" tabindex="1"/>
+  <input class="floatlabel" name="subject" type="text" id="subject" value="{{subject}}" placeholder="{{t 'Subject'}}" tabindex="4"/>
 </div>
 <div class="floatlabel">
   <label class="floatlabel" for="body">Body</label>
-  <textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'Body'}}" tabindex="2">{{body}}</textarea>
+  <textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'Body'}}" tabindex="5">{{body}}</textarea>
 </div>
 
 <div class="buttons-group columns">
diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/app/templates/compose/recipients.hbs
index 6ec29ae5..a632f1d9 100644
--- a/web-ui/app/templates/compose/recipients.hbs
+++ b/web-ui/app/templates/compose/recipients.hbs
@@ -2,18 +2,18 @@
     <div id='recipients-to-area' class="recipients-area input-container columns large-12 no-padding">
         <input class="recipients-navigation-handler"/>
         <label class="column large-1">{{t 'TO'}}: </label>
-        <input type="text" tabindex="3"/>
+        <input id='recipients-to-box' type="text" tabindex="1"/>
     </div>
 
     <div id="recipients-cc-area" class="recipients-area input-container columns large-12 no-padding">
         <input class="recipients-navigation-handler"/>
         <label class="column large-1">{{t 'CC'}}: </label>
-        <input type="text" tabindex="4"/>
+        <input type="text" tabindex="2"/>
     </div>
 
     <div id="recipients-bcc-area" class="recipients-area input-container columns large-12 no-padding">
         <input class="recipients-navigation-handler"/>
         <label class="column large-1">{{t 'BCC'}}: </label>
-        <input type="text" tabindex="5"/>
+        <input type="text" tabindex="3"/>
     </div>
-</div>
-\ No newline at end of file
+</div>