diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index da80295b..a49f4f6b 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1,8 +1,74 @@
 {
-  "hello": {
-    "message": "hello"
+  "bitwarden": {
+    "message": "bitwarden"
   },
-  "world": {
-    "message": "world"
+  "allItems": {
+    "message": "All Items"
+  },
+  "favorites": {
+    "message": "Favorites"
+  },
+  "types": {
+    "message": "Types"
+  },
+  "typeLogin": {
+    "message": "Login"
+  },
+  "typeCard": {
+    "message": "Card"
+  },
+  "typeIdentity": {
+    "message": "Identity"
+  },
+  "typeSecureNote": {
+    "message": "Secure Note"
+  },
+  "folders": {
+    "message": "Folders"
+  },
+  "collections": {
+    "message": "Collections"
+  },
+  "noFolder": {
+    "message": "No Folder"
+  },
+  "searchVault": {
+    "message": "Search vault"
+  },
+  "addItem": {
+    "message": "Add Item"
+  },
+  "shared": {
+    "message": "Shared"
+  },
+  "attachments": {
+    "message": "Attachments"
+  },
+  "viewItem": {
+    "message": "View Item"
+  },
+  "name": {
+    "message": "Name"
+  },
+  "uri": {
+    "message": "URI"
+  },
+  "username": {
+    "message": "Username"
+  },
+  "password": {
+    "message": "Password"
+  },
+  "editItem": {
+    "message": "Edit Item"
+  },
+  "itemInformation": {
+    "message": "Item Information"
+  },
+  "emailAddress": {
+    "message": "Email Address"
+  },
+  "masterPassword": {
+    "message": "Master Password"
   }
 }
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 132bc0d0..6e900c6d 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -1,7 +1,7 @@
 <form (ngSubmit)="onSubmit()" #heroForm="ngForm">
-    <label for="email">Email Address</label>
+    <label for="email">{{'emailAddress' | i18n}}</label>
     <input id="email" type="text" [(ngModel)]="email" name="email" required /><br /><br />
-    <label for="master-password">Master Password</label>
+    <label for="master-password">{{'masterPassword' | i18n}}</label>
     <input id="master-password" type="password" [(ngModel)]="masterPassword"
            name="masterPassword" required /><br /><br />
     <button type="submit">Submit</button>
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index d8232251..b0c668b1 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -74,7 +74,7 @@ const settingsService = new SettingsService(userService, storageService);
 const cipherService = new CipherService(cryptoService, userService, settingsService,
     apiService, storageService);
 const folderService = new FolderService(cryptoService, userService,
-    () => i18nService.t('noneFolder'), apiService, storageService);
+    () => i18nService.t('noFolder'), apiService, storageService);
 const collectionService = new CollectionService(cryptoService, userService, storageService);
 const lockService = new LockService(cipherService, folderService, collectionService,
     cryptoService, platformUtilsService, storageService,
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index ff439253..6662603d 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -1,22 +1,24 @@
 <div class="header header-search">
     <div class="search">
-        <input type="search" placeholder="Search vault" id="search" />
+        <input type="search" placeholder="{{'searchVault' | i18n}}" id="search" />
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
-        <a href="" title="Add Item"><i class="fa fa-plus fa-lg"></i></a>
+        <a href="" title="{{'addItem' | i18n}}"><i class="fa fa-plus fa-lg"></i></a>
     </div>
 </div>
 <div class="content">
     <div class="list">
         <div class="list-section" style="padding-top: 0; padding-bottom: 0;">
             <a *ngFor="let cipher of ciphers" appStopClick (click)="cipherClicked(cipher)"
-               href="#" class="list-section-item condensed" title="View Item">
+               href="#" class="list-section-item condensed" title="{{'viewItem' | i18n}}">
                 <app-vault-icon [cipher]="cipher"></app-vault-icon>
                 <span class="text">
                     {{cipher.name}}
-                    <i class="fa fa-share-alt text-muted" *ngIf="cipher.organizationId"></i>
-                    <i class="fa fa-paperclip text-muted" *ngIf="cipher.attachments"></i>
+                    <i class="fa fa-share-alt text-muted" *ngIf="cipher.organizationId"
+                       title="{{'shared' | i18n}}"></i>
+                    <i class="fa fa-paperclip text-muted" *ngIf="cipher.attachments"
+                       title="{{'attachments' | i18n}}"></i>
                 </span>
                 <span class="detail">{{cipher.subTitle}}</span>
             </a>
@@ -24,5 +26,5 @@
     </div>
 </div>
 <div class="footer">
-    Add Item
+    {{'addItem' | i18n}}
 </div>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index a329a761..fee3b9fe 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -1,23 +1,23 @@
 <div class="content">
     <div class="inner-content">
         <ul>
-            <li><a href="#"><i class="fa fa-fw fa-spinner"></i> All Items</a></li>
-            <li><a href="#"><i class="fa fa-fw fa-star"></i> Favorites</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-spinner"></i> {{'allItems' | i18n}}</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-star"></i> {{'favorites' | i18n}}</a></li>
         </ul>
-        <h2><i class="fa fa-tag"></i> Types</h2>
+        <h2><i class="fa fa-tag"></i> {{'types' | i18n}}</h2>
         <ul>
-            <li><a href="#"><i class="fa fa-fw fa-globe"></i> Login</a></li>
-            <li><a href="#"><i class="fa fa-fw fa-credit-card"></i> Card</a></li>
-            <li><a href="#"><i class="fa fa-fw fa-id-card-o"></i> Identity</a></li>
-            <li><a href="#"><i class="fa fa-fw fa-sticky-note-o"></i> Secure Note</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-globe"></i> {{'typeLogin' | i18n}}</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-credit-card"></i> {{'typeCard' | i18n}}</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-id-card-o"></i> {{'typeIdentity' | i18n}}</a></li>
+            <li><a href="#"><i class="fa fa-fw fa-sticky-note-o"></i> {{'typeSecureNote' | i18n}}</a></li>
         </ul>
-        <h2><i class="fa fa-folder"></i> Folders</h2>
+        <h2><i class="fa fa-folder"></i> {{'folders' | i18n}}</h2>
         <ul class="fa-ul">
             <li *ngFor="let folder of folders">
                 <a href="#"><i class="fa-li fa fa-caret-right"></i> {{folder.name}}</a>
             </li>
         </ul>
-        <h2><i class="fa fa-cubes"></i> Collections</h2>
+        <h2><i class="fa fa-cubes"></i> {{'collections' | i18n}}</h2>
         <ul class="fa-ul">
             <li *ngFor="let collection of collections">
                 <a href="#"><i class="fa-li fa fa-caret-right"></i> {{collection.name}}</a>
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index d84f9f73..291afd38 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -2,24 +2,24 @@
     <div class="inner-content">
         <div class="box">
             <div class="box-header">
-                Item Information
+                {{'itemInformation' | i18n}}
             </div>
             <div class="box-content" *ngIf="cipher">
                 <div class="box-content-row">
-                    <span class="row-label">Name</span>
+                    <span class="row-label">{{'name' | i18n}}</span>
                     {{cipher.name}}
                 </div>
                 <div *ngIf="cipher.login">
                     <div class="box-content-row">
-                        <span class="row-label">URI</span>
+                        <span class="row-label">{{'uri' | i18n}}</span>
                         {{cipher.login.uri}}
                     </div>
                     <div class="box-content-row">
-                        <span class="row-label">Username</span>
+                        <span class="row-label">{{'username' | i18n}}</span>
                         {{cipher.login.username}}
                     </div>
                     <div class="box-content-row">
-                        <span class="row-label">Password</span>
+                        <span class="row-label">{{'password' | i18n}}</span>
                         {{cipher.login.password}}
                     </div>
                 </div>
@@ -31,5 +31,5 @@
     </div>
 </div>
 <div class="footer">
-    Edit
+    {{'editItem' | i18n}}
 </div>