diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
index 935f328..8182143 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
@@ -111,7 +111,10 @@ sendtophone.showFirefoxContextMenu = function(event) {
 
   gContextMenu.showItem("context-sendtophone-text", gContextMenu.isTextSelected ||
   	(gContextMenu.onTextInput && gContextMenu.target.selectionEnd > gContextMenu.target.selectionStart) );
-
+  gContextMenu.showItem("context-sendtophone-email", (gContextMenu.isTextSelected ||
+  	(gContextMenu.onTextInput && gContextMenu.target.selectionEnd > gContextMenu.target.selectionStart))&&
+	this.detectEmail(this.selectText())
+	);
   gContextMenu.showItem("context-sendtophone-page",  !( gContextMenu.inDirList || gContextMenu.isContentSelected || gContextMenu.onTextInput || gContextMenu.onLink || gContextMenu.onImage ));
 
 };
diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
index b65174d..d5161b7 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
@@ -61,6 +61,11 @@
 			accesskey="&sendtophoneContextText.accesskey;"
 			insertafter="context-searchselect"
 			oncommand="sendtophone.onMenuItemCommand(event, 'text')"/>
+		<menuitem id="context-sendtophone-email" label="&sendtophoneContextEmail.label;"
+			class="menuitem-iconic"
+			accesskey="&sendtophoneContextEmail.accesskey;"
+			insertafter="context-searchselect"
+			oncommand="sendtophone.onMenuItemCommand(event, 'email')"/>
 		<menuitem id="context-sendtophone-page" label="&sendtophoneContextPage.label;"
 			class="menuitem-iconic"
 			accesskey="&sendtophoneContextPage.accesskey;"
diff --git a/third_party/firefox_sendtophone/chrome/content/overlay.js b/third_party/firefox_sendtophone/chrome/content/overlay.js
index 0813f68..5fe7954 100644
--- a/third_party/firefox_sendtophone/chrome/content/overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/overlay.js
@@ -62,6 +62,26 @@ var sendtophone = {
 		}
 	},
 
+	detectEmail: function ( email ){
+		var exEmail=/^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$/;
+		return email.match(exEmail);
+	},
+
+	selectText: function (){
+		var input = gContextMenu.target;
+		if (gContextMenu.onTextInput && input && input.value)
+		{
+			selectedText = input.value.substring(input.selectionStart, input.selectionEnd);
+		}
+		else
+		{
+			// Get the selection from the correct iframe
+			var focusedWindow = document.commandDispatcher.focusedWindow;
+			selectedText = focusedWindow.getSelection().toString();
+		}
+		return selectedText;
+	},	
+
 	onMenuItemCommand: function(e, type)
 	{
 		var title, url, selection = '';
@@ -99,17 +119,12 @@ var sendtophone = {
 			case 'text':
 				title = "Selection";
 				url = 'http://google.com/';
-				var input = gContextMenu.target;
-				if (gContextMenu.onTextInput && input && input.value)
-				{
-					selection = input.value.substring(input.selectionStart, input.selectionEnd);
-				}
-				else
-				{
-					// Get the selection from the correct iframe
-					var focusedWindow = document.commandDispatcher.focusedWindow;
-					selection = focusedWindow.getSelection().toString();
-				}
+				selection = this.selectText();
+
+			case 'email':
+				title = "Selected EMail Address";
+				url = "mailto:"+this.selectText();
+				selection = "";
 				break;
 
 			case 'pageButton':
diff --git a/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
index cb775c8..50f8e22 100644
--- a/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Odeslat video do telefonu">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
index 2ada2a0..9082ebb 100644
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
@@ -1,4 +1,4 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox to Phone">
+<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
 <!ENTITY sendtophoneToolbarButton.tooltip "Diese Seite auf Ihr Android Gerät schicken.">
 <!ENTITY sendtophoneContext.label "Link auf Android senden">
 <!ENTITY sendtophoneContext.accesskey "A">
@@ -10,15 +10,18 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Abmelden">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Send To Phone Einstellungen">
+<!ENTITY sendtophoneOptions.title "Fox To Phone Einstellungen">
 <!ENTITY sendtophoneProtocols.label "Protokolle">
-<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.label "Dateien senden ...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.label "Send Ordner ...">
 <!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.label "Send dekodiert QR Link zum Android">
 <!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Send Clipboard">
+<!ENTITY sendtophoneContextSendClipboard.label "Send Merkzettel">
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "Send Video to Android">
+<!ENTITY sendtophoneContextVideo.label "Senden Video zum Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Senden Email zum Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
+
diff --git a/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties b/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties
index 060730c..c7cfb32 100644
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties
@@ -11,13 +11,13 @@ marketLink=Market Link
 smsLink=SMS-Nummer
 smstoLink=SMS-Nummer
 telLink=Telefonnummer
-InvalidFile=Not a valid file
-SendFileToPhone=Send files to your phone.
-SendFolderToPhone=Send a folder to your phone.
-qrTitle=QR Image Link
-ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+InvalidFile=Nicht eine gültige Datei
+SendFileToPhone=Senden Sie Dateien auf Ihr Handy.
+SendFolderToPhone=Senden Sie einen Ordner auf Ihrem Telefon.
+qrTitle=QR-Bild Link
+ConfirmQR=Ein QR-Bild wurde erkannt\n"%s"\nMöchten Sie senden möchten, dass anstelle der Seite?
 RememberMyDecision=Auswahl merken
-qrContextMenu=Send "%s" to Android
-FileUploadsDisabled=It's not possible to upload files to the phone.
-FileTooBig=The file is too big.
+qrContextMenu=Senden "%s" auf Android
+FileUploadsDisabled=Es ist nicht möglich, Dateien auf das Telefon laden.
+FileTooBig=Die Datei ist zu groß.
 videoTitle=Video Link
diff --git a/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd b/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd
index 4bc5eab..319198d 100644
--- a/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd
@@ -1 +1 @@
-<!ENTITY compressing.label "Compressing folder">
+<!ENTITY compressing.label "Komprimieren von Ordner">
diff --git a/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd
index c71a9bd..0a08ae2 100644
--- a/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
index 8466d1b..cdecd6f 100644
--- a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Enviar video a Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
index 9667101..a3d7712 100644
--- a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
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 f3076cf..9184020 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Seol Video chun Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Seol riomhpost chun Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
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 ee0031c..ca5d98b 100644
--- a/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd
index 328a533..eece523 100644
--- a/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Videó küldése az Androidra">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
index 48924e2..f45a64d 100644
--- a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
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 26b9db2..8bf69ba 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
index f0d1d9c..b2f8eff 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -18,3 +18,5 @@
 <!ENTITY sendtophoneContextSendFolder.accesskey "F">
 <!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
 <!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
index 658001f..9fdef77 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
index 3270a3a..627b727 100644
--- a/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "Т">
 <!ENTITY sendtophoneContextVideo.label "Пошаљи видео на Андроид">
 <!ENTITY sendtophoneContextVideo.accesskey "Д">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sr/uploads.dtd b/third_party/firefox_sendtophone/chrome/locale/sr/uploads.dtd
new file mode 100644
index 0000000..4bc5eab
--- /dev/null
+++ b/third_party/firefox_sendtophone/chrome/locale/sr/uploads.dtd
@@ -0,0 +1 @@
+<!ENTITY compressing.label "Compressing folder">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
index 54a7a02..127269f 100644
--- a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
index de503ec..ef81ac7 100644
--- a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index c4b4459..d32a390 100644
--- a/third_party/firefox_sendtophone/install.rdf
+++ b/third_party/firefox_sendtophone/install.rdf
@@ -4,7 +4,7 @@
     <em:id>sendtophone@martinezdelizarrondo.com</em:id>
     <em:type>2</em:type>
     <em:name>Fox To Phone</em:name>
-    <em:version>1.1</em:version>
+    <em:version>1.2</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>