diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
index 2d2b9c1..d3103ff 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
@@ -87,6 +87,9 @@ sendtophone.showFirefoxContextMenu = function(event) {
   // see http://kb.mozillazine.org/Adding_items_to_menus
   gContextMenu.showItem("context-sendtophone-link", gContextMenu.onLink);
   gContextMenu.showItem("context-sendtophone-image", gContextMenu.onImage);
+	var qrPat1=/^http:\/\/chart.apis.google.com\/chart\?/;
+	var qrPat2=/cht=qr/;
+  gContextMenu.showItem("context-sendtophone-qrimage", (gContextMenu.onImage & qrPat1.test(gContextMenu.imageURL) && qrPat2.test(gContextMenu.imageURL)));
   gContextMenu.showItem("context-sendtophone-text", gContextMenu.isTextSelected || 
   	(gContextMenu.onTextInput && gContextMenu.target.selectionEnd > gContextMenu.target.selectionStart) );
 
diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
index cae5c25..e0949d9 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
@@ -43,6 +43,12 @@
 			accesskey="&sendtophoneContextImage.accesskey;"
 			insertafter="context-sendimage"
 			oncommand="sendtophone.onMenuItemCommand(event, 'image')"/>
+		<menuitem id="context-sendtophone-qrimage" label="&sendtophoneContextQrImage.label;"
+			class="menuitem-iconic"
+			accesskey="&sendtophoneContextQrImage.accesskey;"
+			insertafter="context-sendimage"
+			oncommand="sendtophone.onMenuItemCommand(event, 'qr')"/>
+
 		<menuitem id="context-sendtophone-text" label="&sendtophoneContextText.label;"
 			class="menuitem-iconic"
 			accesskey="&sendtophoneContextText.accesskey;"
diff --git a/third_party/firefox_sendtophone/chrome/content/overlay.js b/third_party/firefox_sendtophone/chrome/content/overlay.js
index 8629680..877bfb9 100644
--- a/third_party/firefox_sendtophone/chrome/content/overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/overlay.js
@@ -54,29 +54,33 @@ var sendtophone = {
 				title = gContextMenu.target.title || gContextMenu.target.alt;
 				url = gContextMenu.imageURL;
 				selection = '';
+				break;
+			case 'qr':
+				title = gContextMenu.target.title || gContextMenu.target.alt;
+				url = gContextMenu.imageURL;
+
 				// Detect images of QR codes generated by the Google Charts API
 				// Extract the URI if valid and sendtophone
-				var qrPref = this.prefs.getBoolPref( "qrlink" ) ;
-				var chartType="cht=qr";
-				var chartLink="chl=";
-				var chartUrl="http://chart.apis.google.com/chart?";
-				if(!url.indexOf(chartUrl)&&url.match(chartType)&&qrPref){
-					qrUrl=url.replace(chartUrl, '');
-					qrArray = qrUrl.split("&");
-					for(qrI=0;qrI<qrArray.length;qrI++){
-						if(!qrArray[qrI].indexOf(chartLink)){
-							//Decode and Unescape any URL encoded in the QR Image Link
-							qrUrl=decodeURI(unescape(qrArray[qrI].replace(chartLink, '')));
-							if(this.validURI(qrUrl)){
-								url=qrUrl;
-							}
+				var chartLink=/^chl=/;
+				var chartUrl=/^http:\/\/chart.apis.google.com\/chart\?/;
+
+				url=url.replace(chartUrl, '');
+				qrArray = url.split("&");
+				for(qrI=0;qrI<qrArray.length;qrI++){
+					if(chartLink.test(qrArray[qrI])){
+						//Decode and Unescape any URL encoded in the QR Image Link
+						url=decodeURI(unescape(qrArray[qrI].replace(chartLink, '')));
+						if(this.validURI(url)){
+							url=url;
 						}
 					}
-
-					if(!title){
-						title=this.strings.getString("qrTitle");
-					}
 				}
+				//If the QR Image has no title text, give it one.
+
+				if(!title){
+					title=this.strings.getString("qrTitle");
+				}					
+				selection = '';
 				break;
 			case 'text':
 				title = "Selection";
@@ -147,6 +151,11 @@ var sendtophone = {
 		return url.match("http://maps\\.google\\.[a-z]{2,3}(\\.[a-z]{2})?[/?].*") ||	url.match("http://www\\.google\\.[a-z]{2,3}(\\.[a-z]{2})?/maps.*");
 	},
 
+	validURI: function(uri)
+	{
+		return (/^(https?|market|tel|sms(to)?|mms(to)?|mailto|ftp):/i).test( uri );
+	},
+
 	initPopup: function()
 	{
 		var fileServerUrl = this.prefs.getCharPref( "fileServerUrl" );
diff --git a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
index 6a6a5e9..207521e 100644
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
index c533b8f..11fa344 100644
--- a/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
@@ -1,4 +1,4 @@
-<!ENTITY sendtophoneToolbarButton.label "Send to Phone">
+<!ENTITY sendtophoneToolbarButton.label "Fox to Phone">
 <!ENTITY sendtophoneToolbarButton.tooltip "Send this page to your Android Phone">
 <!ENTITY sendtophoneContext.label "Send this link to Android">
 <!ENTITY sendtophoneContext.accesskey "A">
@@ -16,3 +16,5 @@
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
 <!ENTITY sendtophoneContextSendFolder.label "Send folder...">
 <!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
index 8d0c1db..59bed36 100644
--- a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
@@ -16,3 +16,5 @@
 <!ENTITY sendtophoneContextSendFile.accesskey "E">
 <!ENTITY sendtophoneContextSendFolder.label "Enviar carpeta...">
 <!ENTITY sendtophoneContextSendFolder.accesskey "C">
+<!ENTITY sendtophoneContextQrImage.label "Enviar imagen QR a Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
index 7c8a1c1..e770347 100644
--- a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
index 277f4a4..cd1e2f2 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
index 7470b10..a6281e4 100644
--- a/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
index 70e753d..bdc5532 100644
--- a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
index 42c12e4..b9a97bb 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
index db55594..325f9a2 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
index 2e86e2f..8451dd9 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
index 4562a7d..0c72245 100644
--- a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
index c5cd02e..679f39f 100644
--- a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
@@ -12,5 +12,9 @@
 <!ENTITY sendtophoneContextLogout.accesskey "L">
 <!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
 <!ENTITY sendtophoneProtocols.label "Protocols">
-<!ENTITY sendtophoneContextSendFile.label "Send file...">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
diff --git a/third_party/firefox_sendtophone/chrome/skin/icon.png b/third_party/firefox_sendtophone/chrome/skin/icon.png
index cf6fab4..a1dc50f 100644
Binary files a/third_party/firefox_sendtophone/chrome/skin/icon.png and b/third_party/firefox_sendtophone/chrome/skin/icon.png differ
diff --git a/third_party/firefox_sendtophone/defaults/preferences/prefs.js b/third_party/firefox_sendtophone/defaults/preferences/prefs.js
index 68b98fd..54d522c 100644
--- a/third_party/firefox_sendtophone/defaults/preferences/prefs.js
+++ b/third_party/firefox_sendtophone/defaults/preferences/prefs.js
@@ -12,7 +12,5 @@ pref("extensions.sendtophone.protocols.mms", false); // conflicts with http://en
 pref("extensions.sendtophone.protocols.mmsto", true);
 pref("extensions.sendtophone.protocols.tel", true);
 
-pref("extensions.sendtophone.qrlink", true);
-
 // https://developer.mozilla.org/en/Localizing_extension_descriptions
 pref("extensions.sendtophone@martinezdelizarrondo.com.description", "chrome://sendtophone/locale/overlay.properties");
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index 92c579e..55abd44 100644
--- a/third_party/firefox_sendtophone/install.rdf
+++ b/third_party/firefox_sendtophone/install.rdf
@@ -3,7 +3,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>sendtophone@martinezdelizarrondo.com</em:id>
     <em:type>2</em:type>
-    <em:name>Send To Phone</em:name>
+    <em:name>Fox To Phone</em:name>
     <em:version>1.1</em:version>
     <em:creator>Alfonso &amp; Patrick</em:creator>
     <em:description>Send links to your Android 2.2 phone using the new C2DM service. Based on the ChromeToPhone extension.</em:description>