diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index d57854a..9b4dd0d 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -521,10 +521,15 @@ mailHops.displayResult = function ( header_route, response ){
 		   	else
 		   		label.style.backgroundImage = 'url(chrome://mailhops/content/images/local.png)';
 		   	label.setAttribute('class','dataPaneAddressitem mailhopsDetail');
-		   	if(response.route[i].city && response.route[i].state)
+		   	
+		   	if(response.route[i].city && response.route[i].state){
 			   	label.setAttribute('value','Hop #'+(i+1)+' '+response.route[i].city+', '+response.route[i].state);
-			else if(response.route[i].countryName)
+			   	label.setAttribute('onclick','mailHops.launchWhoIs("'+response.route[i].ip+'");');
+			}
+			else if(response.route[i].countryName){
 				label.setAttribute('value','Hop #'+(i+1)+' '+response.route[i].countryName);
+				label.setAttribute('onclick','mailHops.launchWhoIs("'+response.route[i].ip+'");');
+			}
 			else 
 				label.setAttribute('value','Hop #'+(i+1)+' Private');	
 			
@@ -537,7 +542,7 @@ mailHops.displayResult = function ( header_route, response ){
 			if(response.route[i].whois && response.route[i].whois.netname)
 			   	tiptext+=' '+response.route[i].whois.netname;
 			   	
-			label.setAttribute('tooltiptext',tiptext);
+			label.setAttribute('tooltiptext','Click for whois '+tiptext);
 			
 			//append details
 	   		mailHops.resultDetails.appendChild(label);
@@ -791,7 +796,11 @@ mailHops.addCommas = function(nStr){
 	}
 	return x1 + x2;
 };
-
+mailHops.launchWhoIs = function(ip){
+	var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+	messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+	messenger.launchExternalURL('http://www.mailhops.com/whois/'+ip);
+};
 mailHops.launchSpamHausURL = function(ip){
 	var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
 	messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
diff --git a/chrome/skin/classic/mailhops.css b/chrome/skin/classic/mailhops.css
index 320bd73..7d73f6f 100644
--- a/chrome/skin/classic/mailhops.css
+++ b/chrome/skin/classic/mailhops.css
@@ -30,6 +30,7 @@
 
 .mailhopsDetail{
 	padding-bottom: 2px;
+	cursor: pointer;
 }
 
 .mailHopsLinkContainer{
diff --git a/mailhops-0.6.7-pb.xpi b/mailhops-0.6.7-pb.xpi
index 3c9943d..3bc4208 100644
Binary files a/mailhops-0.6.7-pb.xpi and b/mailhops-0.6.7-pb.xpi differ