diff --git a/gulp/tasks/translations.js b/gulp/tasks/translations.js
index c650148640..1f7aa56aed 100755
--- a/gulp/tasks/translations.js
+++ b/gulp/tasks/translations.js
@@ -20,6 +20,7 @@ const outDir = workDir + '/output';
 const TRANSLATION_FRAGMENTS = [
   'history',
   'logbook',
+  'mailbox',
   'shopping-list',
 ];
 
diff --git a/panels/mailbox/ha-panel-mailbox.html b/panels/mailbox/ha-panel-mailbox.html
index f6096bddd9..8355a9623c 100644
--- a/panels/mailbox/ha-panel-mailbox.html
+++ b/panels/mailbox/ha-panel-mailbox.html
@@ -14,6 +14,7 @@
 
 <link rel='import' href='../../src/components/ha-menu-button.html'>
 <link rel='import' href='../../src/resources/ha-style.html'>
+<link rel='import' href='../../src/util/hass-mixins.html'>
 
 
 <dom-module id='ha-panel-mailbox'>
@@ -50,6 +51,9 @@
       paper-dialog {
         border-radius: 2px;
       }
+      paper-dialog p {
+        color: var(--secondary-text-color);
+      }
 
       #mp3dialog paper-icon-button {
         float: right;
@@ -89,14 +93,14 @@
       <app-header slot="header" fixed>
         <app-toolbar>
           <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-          <div main-title>Mailbox</div>
+          <div main-title>[[localize('panel.mailbox')]]</div>
         </app-toolbar>
       </app-header>
       <div class='content'>
         <paper-card>
           <template is='dom-if' if='[[!_messages.length]]'>
             <div class='card-content'>
-              You do not have any messages.
+              [[localize('ui.panel.mailbox.empty')]]
             </div>
           </template>
           <template is='dom-repeat' items='[[_messages]]'>
@@ -104,7 +108,7 @@
               <paper-item-body style="width:100%" two-line>
                 <div class="row">
                   <div>[[item.caller]]</div>
-                  <div class="tip">[[item.duration]] secs</div>
+                  <div class="tip">[[localize('ui.duration.second', 'count', item.duration)]]</div>
                 </div>
                 <div secondary>
                   <span class="date">[[item.timestamp]]</span> - [[item.message]]
@@ -118,31 +122,33 @@
 
     <paper-dialog with-backdrop id="mp3dialog" on-iron-overlay-closed="_mp3Closed">
       <h2>
-        Message Playback
+        [[localize('ui.panel.mailbox.playback_title')]]
         <paper-icon-button
           on-tap='openDeleteDialog'
           icon='mdi:delete'
         ></paper-icon-button>
       </h2>
-      <div id="transcribe">text</div>
+      <div id="transcribe"></div>
       <div>
         <audio id="mp3" preload="none" controls> <source id="mp3src" src="" type="audio/mpeg"></audio>
       </div>
     </paper-dialog>
 
     <paper-dialog with-backdrop id="confirmdel">
-      <h2>Delete Message</h2>
-      <p>Are you sure you want to delete this message?</p>
+      <p>[[localize('ui.panel.mailbox.delete_prompt')]]</p>
       <div class="buttons">
-        <paper-button dialog-dismiss>Decline</paper-button>
-        <paper-button dialog-confirm autofocus on-tap="deleteSelected">Accept</paper-button>
+        <paper-button dialog-dismiss>[[localize('ui.common.cancel')]]</paper-button>
+        <paper-button dialog-confirm autofocus on-tap="deleteSelected">[[localize('ui.panel.mailbox.delete_button')]]</paper-button>
       </div>
     </paper-dialog>
   </template>
 </dom-module>
 
 <script>
-class HaPanelMailbox extends Polymer.Element {
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelMailbox extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-panel-mailbox'; }
 
   static get properties() {
diff --git a/panels/map/ha-panel-map.html b/panels/map/ha-panel-map.html
index e65e3b39b6..30eb14652f 100644
--- a/panels/map/ha-panel-map.html
+++ b/panels/map/ha-panel-map.html
@@ -5,6 +5,7 @@
 <script src="../../bower_components/leaflet/dist/leaflet.js"></script>
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
+<link rel='import' href='../../src/util/hass-mixins.html'>
 <link rel="import" href="./ha-entity-marker.html">
 
 <dom-module id="ha-panel-map">
@@ -19,7 +20,7 @@
 
     <app-toolbar>
       <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-      <div main-title>Map</div>
+      <div main-title>[[localize('panel.map')]]</div>
     </app-toolbar>
 
     <div id='map'></div>
@@ -29,7 +30,10 @@
 <script>
 window.L.Icon.Default.imagePath = '/static/images/leaflet';
 
-class HaPanelMap extends Polymer.Element {
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelMap extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-panel-map'; }
 
   static get properties() {
diff --git a/src/translations/en.json b/src/translations/en.json
index d230b6a234..2acce5a091 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -275,9 +275,11 @@
   },
   "ui": {
     "common": {
-      "loading": "Loading"
+      "loading": "Loading",
+      "cancel": "Cancel"
     },
     "duration": {
+      "second": "{count} {count, plural,\n  one {second}\n  other {seconds}\n}",
       "day": "{count} {count, plural,\n  one {day}\n  other {days}\n}",
       "week": "{count} {count, plural,\n  one {week}\n  other {weeks}\n}"
     },
@@ -293,6 +295,12 @@
       "logbook": {
         "showing_entries": "[%key:ui::panel::history::showing_entries%]"
       },
+      "mailbox": {
+        "empty": "You do not have any messages",
+        "playback_title": "Message playback",
+        "delete_prompt": "Delete this message?",
+        "delete_button": "Delete"
+      },
       "shopping-list": {
         "clear_completed": "Clear completed",
         "add_item": "Add item",