diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 266346d..977e263 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -24,7 +24,7 @@ var mailHops =
   showWeather:				false,
   map:						'goog',
   unit:						'mi',
-  appVersion:				'MailHops Postbox 0.6.8'  
+  appVersion:				'MailHops Postbox 0.6.9'  
 }
 
 mailHops.init = function()
@@ -174,13 +174,7 @@ var regexAllIp = /(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{
   var received_ips;
   var all_ips = new Array();
   var rline='';
-  //get the originating IP address
-	if(headXOrigIP){
-		var ip = headXOrigIP.match(regexAllIp);
-		if(ip != null && ip.length != 0)
-			all_ips.unshift( ip[0] );
-	}
-  
+    
   //loop through the received headers and parse for IP addresses	
   if ( headReceived ){
   	var headReceivedArr = headReceived.split('\n');
@@ -207,6 +201,12 @@ var regexAllIp = /(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{
       }
     } 
   }
+  //get the originating IP address
+	if(headXOrigIP){
+		var ip = headXOrigIP.match(regexAllIp);
+		if(ip != null && ip.length != 0 && all_ips.indexOf(ip[0])==-1)
+			all_ips.unshift( ip[0] );
+	}
   if ( all_ips.length != 0 ){
    mailHops.lookup ( all_ips ) ;
   } else {
diff --git a/install.rdf b/install.rdf
index 5ceb18d..b4067cc 100644
--- a/install.rdf
+++ b/install.rdf
@@ -7,7 +7,7 @@
 		<em:id>postbox@mailhops.com</em:id>
 		<em:type>2</em:type>
 		<em:name>MailHops</em:name>
-		<em:version>0.6.8</em:version>
+		<em:version>0.6.9</em:version>
 		<em:description>MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>
 		<em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL>
 		<em:homepageURL>http://mailhops.com</em:homepageURL>
diff --git a/mailhops-0.6.9-pb.xpi b/mailhops-0.6.9-pb.xpi
new file mode 100644
index 0000000..85b6e4d
Binary files /dev/null and b/mailhops-0.6.9-pb.xpi differ