diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fb08d4..52bb8b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Added
 - Display styles in settings to customize MailHops bar background color, font color and font size
+- Polish language locale
 
 ### Removed
 - Display show options, data is now always shown for:
@@ -13,6 +14,11 @@
   - SPF
   - DNSBL
 
+### Fixed
+- Received header id parsed as an IP address
+- MailHops bar showing up on load with no message selected
+
+
 ## 3.0.0 - 2016-12-26
 
 ### Added
diff --git a/chrome/content/msgNotificationBar.xul b/chrome/content/msgNotificationBar.xul
index 19885b0..ad881c8 100644
--- a/chrome/content/msgNotificationBar.xul
+++ b/chrome/content/msgNotificationBar.xul
@@ -21,7 +21,7 @@
 
             <label id="mailhopsResultWeather" class="text-link"></label>
 
-       			<button type="menu" class="msgHeaderView-button msgHeaderView-flat-button" label="hops" tooltiptext="Click to view route.">
+       			<button type="menu" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_hops;">
          				<menupopup id="mailhopsDataPaneDetails">
   					    </menupopup>
     				</button>
@@ -36,7 +36,7 @@
 
     				<label id="mailhopsDataPaneDNSBL" class="text-link auth-item" value="" tooltiptext="DNSBL"></label>
 
-            <label id="mailhopsUnsubscribe" class="text-link unsubscribe" value="Unsubscribe" tooltiptext="Unsubscribe"></label>
+            <label id="mailhopsUnsubscribe" class="text-link unsubscribe" value="&mailhops_unsubscribe;"></label>
 
        		</hbox>
 		</row>
diff --git a/chrome/locale/de/strings.dtd b/chrome/locale/de/strings.dtd
index 129be3b..7e8557e 100644
--- a/chrome/locale/de/strings.dtd
+++ b/chrome/locale/de/strings.dtd
@@ -3,5 +3,7 @@
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
 <!ENTITY mailhops_route_nav_map_label          "Karte">
 <!ENTITY mailhops_route_nav_details_label      "Einzelheiten">
-<!ENTITY mailhops_route_nav_refresh_label      "erfrischen">
+<!ENTITY mailhops_route_nav_refresh_label      "Erfrischen">
 <!ENTITY mailhops_route_nav_options_label      "Vorlieben">
+<!ENTITY mailhops_unsubscribe                  "Abbestellen">
+<!ENTITY mailhops_hops                         "Hopfen">
diff --git a/chrome/locale/de/strings.properties b/chrome/locale/de/strings.properties
index 088a8a4..cac8221 100644
--- a/chrome/locale/de/strings.properties
+++ b/chrome/locale/de/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=Karte
 mailhops_route_nav_details_label=Einzelheiten
 mailhops_route_nav_refresh_label=erfrischen
 mailhops_route_nav_options_label=Vorlieben
+mailhops_unsubscribe=Abbestellen
+mailhops_hops=Hopfen
diff --git a/chrome/locale/en/strings.dtd b/chrome/locale/en/strings.dtd
index 03cb2e7..ffb003c 100644
--- a/chrome/locale/en/strings.dtd
+++ b/chrome/locale/en/strings.dtd
@@ -1,7 +1,9 @@
 <!ENTITY mailhops_header_route_label           "MailHops Route">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-<!ENTITY mailhops_route_nav_map_label          "map">
-<!ENTITY mailhops_route_nav_details_label      "details">
-<!ENTITY mailhops_route_nav_refresh_label      "refresh">
+<!ENTITY mailhops_route_nav_map_label          "Map">
+<!ENTITY mailhops_route_nav_details_label      "Details">
+<!ENTITY mailhops_route_nav_refresh_label      "Refresh">
 <!ENTITY mailhops_route_nav_options_label      "Preferences">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/en/strings.properties b/chrome/locale/en/strings.properties
index 0b959dd..9ad41b7 100644
--- a/chrome/locale/en/strings.properties
+++ b/chrome/locale/en/strings.properties
@@ -1,7 +1,9 @@
 mailhops_header_route_label=MailHops Route
 mailhops_header_auth_label=MailHops/Auth
 mailhops_header_meta_label=MailHops Meta
-mailhops_route_nav_map_label=map
-mailhops_route_nav_details_label=details
-mailhops_route_nav_refresh_label=refresh
+mailhops_route_nav_map_label=Map
+mailhops_route_nav_details_label=Details
+mailhops_route_nav_refresh_label=Refresh
 mailhops_route_nav_options_label=Preferences
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/es/strings.dtd b/chrome/locale/es/strings.dtd
index 3a1caa7..d8d2c35 100644
--- a/chrome/locale/es/strings.dtd
+++ b/chrome/locale/es/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "detalles">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
 <!ENTITY mailhops_route_nav_options_label      "Preferencias">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/es/strings.properties b/chrome/locale/es/strings.properties
index ecf39ef..1a77e64 100644
--- a/chrome/locale/es/strings.properties
+++ b/chrome/locale/es/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalles
 mailhops_route_nav_refresh_label=refrescar
 mailhops_route_nav_options_label=Preferencias
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/fr/strings.dtd b/chrome/locale/fr/strings.dtd
index f7758aa..d7f8ba4 100644
--- a/chrome/locale/fr/strings.dtd
+++ b/chrome/locale/fr/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "Détails">
 <!ENTITY mailhops_route_nav_refresh_label      "Rafraîchir">
 <!ENTITY mailhops_route_nav_options_label      "Options">
+<!ENTITY mailhops_unsubscribe                  "Se désabonner">
+<!ENTITY mailhops_hops                         "Houblon">
diff --git a/chrome/locale/fr/strings.properties b/chrome/locale/fr/strings.properties
index 9c34cad..47ce12a 100644
--- a/chrome/locale/fr/strings.properties
+++ b/chrome/locale/fr/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=Carte
 mailhops_route_nav_details_label=Détails
 mailhops_route_nav_refresh_label=Rafraîchir
 mailhops_route_nav_options_label=Options
+mailhops_unsubscribe=Se désabonner
+mailhops_hops=Houblon
diff --git a/chrome/locale/ja/strings.dtd b/chrome/locale/ja/strings.dtd
index 1a2c5f1..c130b6d 100644
--- a/chrome/locale/ja/strings.dtd
+++ b/chrome/locale/ja/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "細部">
 <!ENTITY mailhops_route_nav_refresh_label      "リフレッシュ">
 <!ENTITY mailhops_route_nav_options_label      "設定">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/ja/strings.properties b/chrome/locale/ja/strings.properties
index 88fdb6f..d5f6462 100644
--- a/chrome/locale/ja/strings.properties
+++ b/chrome/locale/ja/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=マップ
 mailhops_route_nav_details_label=細部
 mailhops_route_nav_refresh_label=リフレッシュ
 mailhops_route_nav_options_label=設定
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/pl/strings.dtd b/chrome/locale/pl/strings.dtd
index 7c84506..ee2295a 100644
--- a/chrome/locale/pl/strings.dtd
+++ b/chrome/locale/pl/strings.dtd
@@ -2,8 +2,9 @@
 <!ENTITY mailhops_header_auth_label            "Mailer/Auth">
 <!ENTITY mailhops_header_lists_label           "Listy">
 <!ENTITY mailhops_header_meta_label            "Meta">
-
 <!ENTITY mailhops_route_nav_map_label          "mapa">
 <!ENTITY mailhops_route_nav_details_label      "szczegóły">
 <!ENTITY mailhops_route_nav_refresh_label      "odśwież">
 <!ENTITY mailhops_route_nav_options_label      "opcje">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/pl/strings.properties b/chrome/locale/pl/strings.properties
index 0546f39..e016b41 100644
--- a/chrome/locale/pl/strings.properties
+++ b/chrome/locale/pl/strings.properties
@@ -6,3 +6,5 @@ mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=szczegóły
 mailhops_route_nav_refresh_label=odśwież
 mailhops_route_nav_options_label=opcje
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/pt-BR/strings.dtd b/chrome/locale/pt-BR/strings.dtd
index 78df835..57fa712 100644
--- a/chrome/locale/pt-BR/strings.dtd
+++ b/chrome/locale/pt-BR/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "detalhes">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
 <!ENTITY mailhops_route_nav_options_label      "Preferências">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/pt-BR/strings.properties b/chrome/locale/pt-BR/strings.properties
index 8f3ff12..c7c02c5 100644
--- a/chrome/locale/pt-BR/strings.properties
+++ b/chrome/locale/pt-BR/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalhes
 mailhops_route_nav_refresh_label=refrescar
 mailhops_route_nav_options_label=Preferências
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/ru/strings.dtd b/chrome/locale/ru/strings.dtd
index 70da776..d942635 100644
--- a/chrome/locale/ru/strings.dtd
+++ b/chrome/locale/ru/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "подробности">
 <!ENTITY mailhops_route_nav_refresh_label      "обновление">
 <!ENTITY mailhops_route_nav_options_label      "предпочтения">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/ru/strings.properties b/chrome/locale/ru/strings.properties
index 325a1bb..fc8114d 100644
--- a/chrome/locale/ru/strings.properties
+++ b/chrome/locale/ru/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=карта
 mailhops_route_nav_details_label=подробности
 mailhops_route_nav_refresh_label=обновление
 mailhops_route_nav_options_label=предпочтения
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops
diff --git a/chrome/locale/zh-CN/strings.dtd b/chrome/locale/zh-CN/strings.dtd
index f900c4c..4dd569b 100644
--- a/chrome/locale/zh-CN/strings.dtd
+++ b/chrome/locale/zh-CN/strings.dtd
@@ -5,3 +5,5 @@
 <!ENTITY mailhops_route_nav_details_label      "詳細信息">
 <!ENTITY mailhops_route_nav_refresh_label      "刷新">
 <!ENTITY mailhops_route_nav_options_label      "优先">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">
diff --git a/chrome/locale/zh-CN/strings.properties b/chrome/locale/zh-CN/strings.properties
index 8738c2e..1d848ff 100644
--- a/chrome/locale/zh-CN/strings.properties
+++ b/chrome/locale/zh-CN/strings.properties
@@ -5,3 +5,5 @@ mailhops_route_nav_map_label=地圖
 mailhops_route_nav_details_label=詳細信息
 mailhops_route_nav_refresh_label=刷新
 mailhops_route_nav_options_label=优先
+mailhops_unsubscribe=Unsubscribe
+mailhops_hops=Hops