diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123bb1f..b02201d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 3.1.2 - 2017-07-18
+
+### Fixed
+- Account Message Bubble
+
 ## 3.1.1 - 2017-07-15
 
 ### Added
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 5a62129..29e5aeb 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,7 +9,7 @@ var mailHops =
   msgURI:	null,
   isLoaded: false,
   options: {
-      'version':'MailHops Plugin 3.1.1',
+      'version':'MailHops Plugin 3.1.2',
       'lan':'en',
       'unit':'mi',
       'api_http':'https://',
diff --git a/chrome/content/msgNotificationBar.js b/chrome/content/msgNotificationBar.js
index 5d96c87..69b1a88 100644
--- a/chrome/content/msgNotificationBar.js
+++ b/chrome/content/msgNotificationBar.js
@@ -9,8 +9,7 @@ var mailHopsDisplay =
   mailhopsDataPaneDNSBL:  null,
   mailhopsResultWeather:  null,
   mailhopsUnsubscribe:    null,
-  mailHopsMessage:        null,
-  mailHopsMessageText:    null,
+  mailHopsAccountMessage: null,
   mhBox:                  null,
   options:                null,
 
@@ -23,8 +22,7 @@ var mailHopsDisplay =
     this.mailhopsResultWeather = document.getElementById("mailhopsResultWeather");
     this.mailhopsUnsubscribe = document.getElementById("mailhopsUnsubscribe");
     this.resultDetails = document.getElementById("mailhopsDataPaneDetails");
-    this.mailHopsMessage = document.getElementById("mailHopsMessage");
-    this.mailHopsMessageText = document.getElementById("mailHopsMessageText");
+    this.mailHopsAccountMessage = document.getElementById("mailHopsAccountMessage");
 
     //auth
     this.mailhopsDataPaneSPF = document.getElementById("mailhopsDataPaneSPF");
@@ -52,8 +50,9 @@ var mailHopsDisplay =
       mailHopsUtils.launchExternalURL(this.getAttribute('href'));
     });
 
-    this.mailHopsMessageText.addEventListener("click", function () {
+    this.mailHopsAccountMessage.addEventListener("click", function () {
       mailHopsUtils.launchExternalURL(this.getAttribute('href'));
+      this.style.display = 'none';
     });
 
     this.mailhopsUnsubscribe.addEventListener("click", function () {
@@ -214,6 +213,7 @@ var mailHopsDisplay =
     this.mailhopsResultWeather.style.display = 'none';
     this.resultText.removeAttribute('data-route');
     this.resultText.style.backgroundImage = '';
+    this.mailHopsAccountMessage.style.display = 'none';
     //remove child details
     while(this.resultDetails.firstChild) {
         this.resultDetails.removeChild(this.resultDetails.firstChild);
@@ -346,8 +346,9 @@ var mailHopsDisplay =
         this.mailhopsResultWeather.setAttribute('href','https://darksky.net/forecast/'+weatherRoute.lat+','+weatherRoute.lng);
     }
 
-    if(image.indexOf('local')!=-1) {
+    if(image.indexOf('local') !== -1) {
       displayText = ' Local message.';
+      this.mailHopsAccountMessage.style.display = 'none';
     } else {
 
       if(!!first){
@@ -387,13 +388,13 @@ var mailHopsDisplay =
     this.resultText.style.backgroundImage = 'url('+image+')';
 
     if(meta && meta.message){
-      this.mailHopsMessage.style.display = 'inline';
+      this.mailHopsAccountMessage.style.display = 'inline';
       if(meta.message.text)
-        this.mailHopsMessageText.value = meta.message.text;
+        this.mailHopsAccountMessage.value = meta.message.text;
       if(meta.message.url)
-        this.mailHopsMessageText.setAttribute('href', meta.message.url);
+        this.mailHopsAccountMessage.setAttribute('href', meta.message.url);
     } else {
-      this.mailHopsMessage.style.display = 'none';
+      this.mailHopsAccountMessage.style.display = 'none';
     }
   }, //end route
 
diff --git a/chrome/content/msgNotificationBar.xul b/chrome/content/msgNotificationBar.xul
index 273a613..5ff693a 100644
--- a/chrome/content/msgNotificationBar.xul
+++ b/chrome/content/msgNotificationBar.xul
@@ -14,9 +14,8 @@
 	<rows id="msgNotificationBar">
 		<row id="mailhopsNoficationBox" collapsed="false">
 			    <image id="mailhopsLogo" src="chrome://mailhops/content/images/mailhops32.png" width="32" height="32" tooltiptext="&mailhops_route_nav_options_label;"/>
-          <div id="mailHopsMessage">
-            <label id="mailHopsMessageText" class="bar-link" value="Join today for metrics and more."></label>
-          </div>
+
+          <label id="mailHopsAccountMessage" class="bar-link" value="Join today"></label>
 
        		<hbox id="mailhopsResult" flex="1">
 
diff --git a/chrome/skin/classic/msgNotificationBar.css b/chrome/skin/classic/msgNotificationBar.css
index 9d0e549..dda1db2 100644
--- a/chrome/skin/classic/msgNotificationBar.css
+++ b/chrome/skin/classic/msgNotificationBar.css
@@ -90,15 +90,11 @@
 	filter: none;
 }
 
-#mailHopsMessage {
+#mailHopsAccountMessage {
 	z-index:10;
 	border-radius: 10px;
 	display: none;
-	position: absolute;
-	padding:10px;
-	margin-top:40px;
-	margin-left: -28px;
-	width: auto;
+	padding: 10px;
 	border: 1px solid #CCC;
 	color: #777;
 	background-color: #FFF;
diff --git a/install.rdf b/install.rdf
index cc8c58a..a1f8a90 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>3.1.1</em:version>
+		<em:version>3.1.2</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>