diff --git a/third_party/firefox_sendtophone/chrome.manifest b/third_party/firefox_sendtophone/chrome.manifest
index aa1b312..d66fc1e 100644
--- a/third_party/firefox_sendtophone/chrome.manifest
+++ b/third_party/firefox_sendtophone/chrome.manifest
@@ -2,6 +2,7 @@ content   sendtophone                 chrome/content/
 skin      sendtophone   classic/1.0   chrome/skin/
 resource   sendtophone                 modules/
 
+locale	sendtophone	ca		chrome/locale/ca/
 locale	sendtophone	cs		chrome/locale/cs/
 locale	sendtophone	de		chrome/locale/de/
 locale	sendtophone	en-US		chrome/locale/en-US/
@@ -18,7 +19,7 @@ locale	sendtophone	pt-BR		chrome/locale/pt-BR/
 locale	sendtophone	ru		chrome/locale/ru/
 locale	sendtophone	sr		chrome/locale/sr/
 locale	sendtophone	sv		chrome/locale/sv/
-locale	sendtophone	tr-TR		chrome/locale/tr-TR/
+locale	sendtophone	tr		chrome/locale/tr/
 locale	sendtophone	zh-CN		chrome/locale/zh-CN/
 locale	sendtophone	zh-TW		chrome/locale/zh-TW/
 
diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
index 53eef89..bbd0744 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
@@ -164,7 +164,7 @@ sendtophone.doDrop = function(event)
 	{
 		case "text/plain":
 			var plainText = dt.getData(types[0]);
-			sendtophoneCore.send("Selection", "http://google.com", plainText);
+			sendtophoneCore.send("Selection", "http://www.foxtophone.com/text-copied/", plainText);
 			break;
 
 		case "text/x-moz-url":
diff --git a/third_party/firefox_sendtophone/chrome/content/options.js b/third_party/firefox_sendtophone/chrome/content/options.js
index e8fbd8a..826db03 100644
--- a/third_party/firefox_sendtophone/chrome/content/options.js
+++ b/third_party/firefox_sendtophone/chrome/content/options.js
@@ -11,6 +11,13 @@ let foxToPhonePreferences =
 
 		let fileserverMenuList = document.getElementById("extensionsSendToPhoneFileServer") ;
 
+		// Remove old setting as it's no longer working
+		if ( fileServerUrl == "http://min.us" )
+		{
+			document.getElementById("extensions.sendtophone.fileServerUrl").value = "";
+			fileServerUrl = "";
+		}
+
 		switch (fileServerUrl)
 		{
 			case '':
diff --git a/third_party/firefox_sendtophone/chrome/content/options.xul b/third_party/firefox_sendtophone/chrome/content/options.xul
index 3aaa487..f3f1deb 100644
--- a/third_party/firefox_sendtophone/chrome/content/options.xul
+++ b/third_party/firefox_sendtophone/chrome/content/options.xul
@@ -61,7 +61,7 @@
 
 	</groupbox>
 
-		<groupbox style="padding:1em; min-height:10em;">
+		<groupbox style="padding:1em; min-height:11em;">
 			<caption label="&sendtophoneFileTransfers.label;" />
 			<hbox align="center">
 				<label value="&sendtophoneFileServer.label;" 
@@ -75,7 +75,7 @@
 					</menupopup>
 				</menulist>
 
-				<description style="width:300px; height:3em;" id="foxtophoneDisclaimer">
+				<description style="width:300px; min-height:4em;" id="foxtophoneDisclaimer">
 				&sendtophoneFileServer.Disclaimer;
 				</description>
 			</hbox>
diff --git a/third_party/firefox_sendtophone/chrome/content/overlay.js b/third_party/firefox_sendtophone/chrome/content/overlay.js
index e658f60..5b0cb90 100644
--- a/third_party/firefox_sendtophone/chrome/content/overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/overlay.js
@@ -97,7 +97,7 @@ var sendtophone = {
 				break;
 			case 'text':
 				title = "Selection";
-				url = 'http://google.com/';
+				url = 'http://www.foxtophone.com/text-copied/';
 				var input = gContextMenu.target;
 				if (gContextMenu.onTextInput && input && input.value)
 				{
@@ -317,7 +317,7 @@ var sendtophone = {
 
 		// Send it.
 		if (pastetext)
-			sendtophoneCore.send("Clipboard", "http://google.com", pastetext);
+			sendtophoneCore.send("Clipboard", "http://www.foxtophone.com/text-copied/", pastetext);
 	},
 
 	logout: function()
diff --git a/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.dtd
deleted file mode 100644
index f5188e7..0000000
--- a/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.dtd
+++ /dev/null
@@ -1,34 +0,0 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
-<!ENTITY sendtophoneToolbarButton.tooltip "Bu sayfayı Android telefonuna gönder">
-<!ENTITY sendtophoneContext.label "Bu linki Android'e gönder">
-<!ENTITY sendtophoneContext.accesskey "A">
-<!ENTITY sendtophoneContextImage.label "Bu resmi Android'e gönder">
-<!ENTITY sendtophoneContextImage.accesskey "A">
-<!ENTITY sendtophoneContextText.label "Bu metni Android'e gönder">
-<!ENTITY sendtophoneContextText.accesskey "A">
-<!ENTITY sendtophoneContextPage.label "Bu sayfayı Android'e gönder">
-<!ENTITY sendtophoneContextPage.accesskey "A">
-<!ENTITY sendtophoneContextLogout.label "Çıkış">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Fox To Phone Seçenekleri">
-<!ENTITY sendtophoneProtocols.label "Protokoller">
-<!ENTITY sendtophoneContextSendFile.label "Dosyaya Gönder">
-<!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "Klasöre Gönder">
-<!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "Çözümlenmiş QR Bağlantısını Android'e Gönder">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Panoya Gönder">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "Videoyu Andoid'e Gönder">
-<!ENTITY sendtophoneContextVideo.accesskey "V">
-<!ENTITY sendtophoneFileTransfers.label "Dosya aktarımları">
-<!ENTITY sendtophoneFileServer.label "Sunucu">
-<!ENTITY sendtophoneFileServer.None "Hiç">
-<!ENTITY sendtophoneFileServer.Custom "Özel">
-<!ENTITY sendtophoneFileServer.Disclaimer "Yasal Uyarı: Bizim (FoxToPhone geliştiricileri) burada listelenen üçüncü taraf barındırma hizmetleriyle bağlantımız yoktur. Bunları kullanmadan önce servisin kendi koşullarını okumalısınız.">
-<!ENTITY sendtophonePhoneAccounts.label "Telefon hesapları">
-<!ENTITY sendtophonePhoneAccounts.description "Eğer cihazınızda birkaç Google hesabı kullanıyorsanız, burada oluşturduktan sonra bunlar arasında geçiş yapabilirsiniz.">
-<!ENTITY sendtophonePhoneAccounts.add "Yeni ekle">
-<!ENTITY sendtophonePhoneAccounts.rename "Yeniden adlandır">
-<!ENTITY sendtophonePhoneAccounts.remove "Kaldır">
diff --git a/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.properties b/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.properties
deleted file mode 100644
index 3631477..0000000
--- a/third_party/firefox_sendtophone/chrome/locale/tr-TR/overlay.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-extensions.sendtophone@martinezdelizarrondo.com.description=Geçerli sayfayı Android telefonunuza gönderir
-SendToPhoneTitle=Fox To Phone
-InvalidScheme=Geçersiz düzen,lütfen sadece http:// veya https:// bağlantısı gönderin.
-InfoSent=Bağlantı telefonunuza gönderildi.
-ErrorOnSend=Gönderirken bir hata oluştu:
-LoginRequired=Bağlantı göndermek için giriş gerekli.
-LoginSuccessful=Giriş yaptınız.
-DeviceNotRegistered=GMail hesabına kayıtlı telefonunuza chrometophone.apk yüklemeniz gerekir.
-LogoutSuccessful=Çıkış yaptınız
-marketLink=Market Bağlantısı
-smsLink=SMS Numarası
-smstoLink=SMS Numarası
-telLink=Telefon Numarası
-InvalidFile=Geçersiz dosya
-SendFileToPhone=Telefona dosya gönder.
-SendFolderToPhone=Telefona klasör gönder.
-qrTitle=QR Görüntü Bağlantısı
-ConfirmQR=Bir QR görüntüsü tespit edildi\n"%s"\nSayfanın yerine bunu göndermek istiyor musunuz?
-RememberMyDecision=Seçimlerimi hatırla
-qrContextMenu="%s" Android'e gönder
-FileUploadsDisabled=Bu telefona dosya yüklemek mümkün değil.
-FileTooBig=Dosya çok büyük.
-videoTitle=Video Bağlantısı
-PhoneAccountPromptAdd=Lütfen, yeni hesabın adını yazın
-PhoneAccountPromptRename=Lütfen, bu hesap için yeni bir ad yazın
-PhoneAccountPromptRemove=Bu hesabı silmek istediğinizden emin misiniz?
diff --git a/third_party/firefox_sendtophone/chrome/locale/tr-TR/uploads.dtd b/third_party/firefox_sendtophone/chrome/locale/tr-TR/uploads.dtd
deleted file mode 100644
index f5b0f00..0000000
--- a/third_party/firefox_sendtophone/chrome/locale/tr-TR/uploads.dtd
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY compressing.label "Sıkıştırılmış klasör">
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index 4e8c341..8b3f194 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.2.3</em:version>
+		<em:version>1.2.4</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>
 
diff --git a/third_party/firefox_sendtophone/modules/sendtophone.js b/third_party/firefox_sendtophone/modules/sendtophone.js
index 2c904d4..5998cb1 100644
--- a/third_party/firefox_sendtophone/modules/sendtophone.js
+++ b/third_party/firefox_sendtophone/modules/sendtophone.js
@@ -211,6 +211,13 @@ var sendtophoneCore = {
 			return;
 		}
 
+		// Avoid USSD codes:
+		if ((/^(tel|sms(to)?):.*[^\d\s\+].*/i).test( url ))
+		{
+			this.alert("Invalid telephone number");
+			return;
+		}
+
 		var max_length = 1024;
 		if (selection.length > max_length)
 			selection = selection.substring(0, max_length);