6 files changed, 10 insertions, 11 deletions
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index a724f27b..83d5ca27 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -7,8 +7,8 @@
     {{> recipients }}
         <div class="clearfix">
             <a id="to-trigger" class="hide">{{t 'to'}}</a>
-            <a id="ccs-trigger" class="hide">{{t 'CC'}}</a>
-            <a id="bccs-trigger" class="hide">{{t 'BCC'}}</a>
+            <a id="ccs-trigger" class="hide">{{t 'cc'}}</a>
+            <a id="bccs-trigger" class="hide">{{t 'bcc'}}</a>
         </div>
 
         <div class="floatlabel">
diff --git a/web-ui/app/templates/compose/no_mails_available.hbs b/web-ui/app/templates/compose/no_mails_available.hbs
index 147f3533..c61152a4 100644
--- a/web-ui/app/templates/compose/no_mails_available.hbs
+++ b/web-ui/app/templates/compose/no_mails_available.hbs
@@ -1,7 +1,7 @@
 <div class="no-mails-available-pane">
   {{#if forSearch }}
-    {{t 'NO RESULTS FOR'}}: '{{ forSearch }}'.
+    {{t 'no-results-for'}}: '{{ forSearch }}'.
   {{else}}
-    {{t 'NO EMAILS IN'}} '{{ tag }}'.
+    {{t 'no-emails-in'}} '{{t tag}}'.
   {{/if}}
 </div>
diff --git a/web-ui/app/templates/compose/no_message_selected.hbs b/web-ui/app/templates/compose/no_message_selected.hbs
index 71aa6267..0b9beaf8 100644
--- a/web-ui/app/templates/compose/no_message_selected.hbs
+++ b/web-ui/app/templates/compose/no_message_selected.hbs
@@ -1,3 +1,3 @@
 <div class="no-message-selected-pane">
-    <div class="no-message-selected-pane__text">{{t 'NOTHING SELECTED'}}.</div>
+    <div class="no-message-selected-pane__text">{{t 'nothing-selected'}}.</div>
 </div>
diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/app/templates/compose/recipients.hbs
index 056cdab9..43aced1c 100644
--- a/web-ui/app/templates/compose/recipients.hbs
+++ b/web-ui/app/templates/compose/recipients.hbs
@@ -13,7 +13,7 @@
     <div id="recipients-cc-area" class="recipients-area input-container columns large-12 no-padding">
         <input class="recipients-navigation-handler"/>
         <div class='compose-column-label'>
-          <label for="recipients-cc-box" class="recipients-label column large-1">{{t 'CC'}}: </label>
+          <label for="recipients-cc-box" class="recipients-label column large-1">{{t 'cc'}}: </label>
         </div>
         <div class='recipients-list compose-column-recipients'>
           <input id='recipients-cc-box' class="recipients-input" type="text" tabindex="2"/>
@@ -23,7 +23,7 @@
     <div id="recipients-bcc-area" class="recipients-area input-container columns large-12 no-padding">
         <input class="recipients-navigation-handler"/>
         <div class='compose-column-label'>
-          <label for ="recipients-bcc-box" class="recipients-label column large-1">{{t 'BCC'}}: </label>
+          <label for ="recipients-bcc-box" class="recipients-label column large-1">{{t 'bcc'}}: </label>
         </div>
         <div class='recipients-list compose-column-recipients'>
           <input id='recipients-bcc-box' class="recipients-input" type="text" tabindex="3"/>
diff --git a/web-ui/app/templates/compose/reply_section.hbs b/web-ui/app/templates/compose/reply_section.hbs
index 85ab49c4..45203d87 100644
--- a/web-ui/app/templates/compose/reply_section.hbs
+++ b/web-ui/app/templates/compose/reply_section.hbs
@@ -1,6 +1,6 @@
 <div class="reply-container columns small-12 large-12">
-  <button id="reply-button" class="column small-12 large-4">{{t 'Reply'}} <i class="fa fa-reply"></i></button>
+  <button id="reply-button" class="column small-12 large-4">{{t 'reply'}} <i class="fa fa-reply"></i></button>
   <button id="reply-all-button" class="column small-12 large-4">{{t 'reply-to-all'}} <i class="fa fa-reply-all"></i></button>
-  <button id="forward-button" class="column small-12 large-4">{{t 'Forward'}} <i class="fa fa-mail-forward"></i></button>
+  <button id="forward-button" class="column small-12 large-4">{{t 'forward'}} <i class="fa fa-mail-forward"></i></button>
   <div id="reply-box" style="display:none"></div>
 </div>
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 8c486275..40bfd4a2 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -53,7 +53,7 @@
             {{/each }}
 
             <li class="mail-read-view__header-tags-name-input">
-                <input type="text" id="new-tag-input" placeholder="{{t 'Press Enter to add tag'}}"
+                <input type="text" id="new-tag-input" placeholder="{{t 'add-tag-placeholder'}}"
                 />
             </li>
 
@@ -81,4 +81,3 @@
         </div>
     {{/if}}
 </div>
-