diff --git a/third_party/firefox_sendtophone/chrome.manifest b/third_party/firefox_sendtophone/chrome.manifest
index f9df281..ffeeb1d 100644
--- a/third_party/firefox_sendtophone/chrome.manifest
+++ b/third_party/firefox_sendtophone/chrome.manifest
@@ -13,6 +13,7 @@ locale	sendtophone	hu		chrome/locale/hu/
 locale	sendtophone	it		chrome/locale/it/
 locale	sendtophone	ja-JP		chrome/locale/ja-JP/
 locale	sendtophone	nl		chrome/locale/nl/
+locale	sendtophone	pl		chrome/locale/pl/
 locale	sendtophone	pt-BR		chrome/locale/pt-BR/
 locale	sendtophone	ru		chrome/locale/ru/
 locale	sendtophone	sr		chrome/locale/sr/
diff --git a/third_party/firefox_sendtophone/chrome/content/overlay.js b/third_party/firefox_sendtophone/chrome/content/overlay.js
index e42b206..e658f60 100644
--- a/third_party/firefox_sendtophone/chrome/content/overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/overlay.js
@@ -266,8 +266,8 @@ var sendtophone = {
 	initPopup: function()
 	{
 		var fileServerUrl = this.prefs.getCharPref( "fileServerUrl" );
-		document.getElementById("sendtophoneContextMenuSendFiles").hidden = !fileServerUrl;
-		document.getElementById("sendtophoneContextMenuSendFolder").hidden = !fileServerUrl;
+		document.getElementById("sendtophoneContextMenuSendFiles").disabled = !fileServerUrl;
+		document.getElementById("sendtophoneContextMenuSendFolder").disabled = !fileServerUrl;
 
 		document.getElementById("sendtophoneContextMenuSendClipboard").disabled = !this.clipboardHasText();
 
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
index c218712..fadd2c1 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -27,3 +27,8 @@
 <!ENTITY sendtophoneFileServer.None "Geen">
 <!ENTITY sendtophoneFileServer.Custom "Aangepast">
 <!ENTITY sendtophoneFileServer.Disclaimer "Disclaimer: Wij (de ontwikkelaars van FoxToPhone) zijn niet gelieerd aan de hier genoemde externe hostingdiensten. U dient de erbij behorende servicevoorwaarden te lezen voordat u er gebruik van maakt.">
+<!ENTITY sendtophonePhoneAccounts.label "Telefoonaccounts">
+<!ENTITY sendtophonePhoneAccounts.description "Als u verscheidene Google-accounts gebruikt op uw apparaten kunt u ertussen wisselen nadat u ze hier hebt aangemaakt.">
+<!ENTITY sendtophonePhoneAccounts.add "Nieuw toevoegen">
+<!ENTITY sendtophonePhoneAccounts.rename "Hernoemen">
+<!ENTITY sendtophonePhoneAccounts.remove "Verwijderen">
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties
index 5fd3a8c..9b43c65 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties
@@ -21,3 +21,6 @@ qrContextMenu=“%s” naar Android verzenden
 FileUploadsDisabled=Het is niet mogelijk om bestanden naar de telefoon te uploaden.
 FileTooBig=Het bestand is te groot.
 videoTitle=Videokoppeling
+PhoneAccountPromptAdd=Vul de naam van de nieuwe account in
+PhoneAccountPromptRename=Vul de naam van deze account in
+PhoneAccountPromptRemove=Weet u zeker dat u deze account wilt verwijderen?
diff --git a/third_party/firefox_sendtophone/chrome/locale/pl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/pl/overlay.dtd
new file mode 100644
index 0000000..5093266
--- /dev/null
+++ b/third_party/firefox_sendtophone/chrome/locale/pl/overlay.dtd
@@ -0,0 +1,29 @@
+<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
+<!ENTITY sendtophoneToolbarButton.tooltip "Wyślij tę stronę do telefonu z systemem Android">
+<!ENTITY sendtophoneContext.label "Wyślij ten link">
+<!ENTITY sendtophoneContext.accesskey "A">
+<!ENTITY sendtophoneContextImage.label "Wyślij ten obrazek">
+<!ENTITY sendtophoneContextImage.accesskey "A">
+<!ENTITY sendtophoneContextText.label "Wyślij ten tekst">
+<!ENTITY sendtophoneContextText.accesskey "A">
+<!ENTITY sendtophoneContextPage.label "Wyślij tę stronę">
+<!ENTITY sendtophoneContextPage.accesskey "A">
+<!ENTITY sendtophoneContextLogout.label "Wyloguj">
+<!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Ustawienia Fox To Phone">
+<!ENTITY sendtophoneProtocols.label "Protokoły">
+<!ENTITY sendtophoneContextSendFile.label "Wyślij pliki...">
+<!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Wyślij folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Wyślij rozkodowany kod QR">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextSendClipboard.label "Wyślij zawartość schowka">
+<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
+<!ENTITY sendtophoneContextVideo.label "Wyślij ten film">
+<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneFileTransfers.label "Transfery plików">
+<!ENTITY sendtophoneFileServer.label "Serwer">
+<!ENTITY sendtophoneFileServer.None "Żadne">
+<!ENTITY sendtophoneFileServer.Custom "Własne">
+<!ENTITY sendtophoneFileServer.Disclaimer "Zastrzeżenie: My (twórcy FoxToPhone) nie jesteśmy powiązani z żadną widoczną tutaj usługą przechowywania plików. Powinieneś przeczytać ich Warunki użytkowania zanim zaczniesz korzystać z usługi.">
diff --git a/third_party/firefox_sendtophone/chrome/locale/pl/overlay.properties b/third_party/firefox_sendtophone/chrome/locale/pl/overlay.properties
new file mode 100644
index 0000000..24a49cd
--- /dev/null
+++ b/third_party/firefox_sendtophone/chrome/locale/pl/overlay.properties
@@ -0,0 +1,23 @@
+extensions.sendtophone@martinezdelizarrondo.com.description=Wysyła aktualnie oglądaną stronę do twojego telefonu z systemem Android
+SendToPhoneTitle=Fox To Phone
+InvalidScheme=Błedny adres, proszę wysyłać tylko linki http:// lub https://.
+InfoSent=Ten link został wysłany do twojego telefonu.
+ErrorOnSend=Wystąpił błąd podczas wysyłania:
+LoginRequired=Musisz się zalogować, aby wysłać link.
+LoginSuccessful=Zalogowałeś się.
+DeviceNotRegistered=Musisz zainstalować aplikację ChromeToPhone na twoim telefonie połączonym z tym kontem Gmail
+LogoutSuccessful=Zostałeś wylogowany.
+marketLink=Link do Android Marketu
+smsLink=Numer telefonu (SMS)
+smstoLink=Numer telefonu (SMS)
+telLink=Numer telefonu
+InvalidFile=To nie jest poprawny plik
+SendFileToPhone=Wyślij pliki do twojego telefonu.
+SendFolderToPhone=Wyślij folder do twojego telefonu.
+qrTitle=Link do kodu QR
+ConfirmQR=Wykryto kod QR\n"%s"\nCzy chcesz wysłać go zamiast linku do strony?
+RememberMyDecision=Zapamiętaj mój wybór
+qrContextMenu=Wyślij "%s"
+FileUploadsDisabled=Nie można wysłać plików do telefonu.
+FileTooBig=Plik jest za duży.
+videoTitle=Link do filmu
diff --git a/third_party/firefox_sendtophone/chrome/locale/pl/uploads.dtd b/third_party/firefox_sendtophone/chrome/locale/pl/uploads.dtd
new file mode 100644
index 0000000..ca0f9e4
--- /dev/null
+++ b/third_party/firefox_sendtophone/chrome/locale/pl/uploads.dtd
@@ -0,0 +1 @@
+<!ENTITY compressing.label "Kompresuję folder">
diff --git a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd
index ce88a9a..8cc98d1 100644
--- a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd
@@ -22,3 +22,13 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "t">
 <!ENTITY sendtophoneContextVideo.label "Enviar vídeo para o Android">
 <!ENTITY sendtophoneContextVideo.accesskey "v">
+<!ENTITY sendtophoneFileTransfers.label "Transferências de arquivos">
+<!ENTITY sendtophoneFileServer.label "Servidor">
+<!ENTITY sendtophoneFileServer.None "Nenhum">
+<!ENTITY sendtophoneFileServer.Custom "Personalizado">
+<!ENTITY sendtophoneFileServer.Disclaimer "Declaração: Nós (desenvolvedores do FoxToPhone) não somos afiliados a nenhum dos serviços de hospedagem de terceiros listados aqui. Você deve ler seus termos de serviço antes de usá-los.">
+<!ENTITY sendtophonePhoneAccounts.label "Contas de telefone">
+<!ENTITY sendtophonePhoneAccounts.description "Se estiver usando várias contas do Google com os seus dispositivos, você pode alternar entre elas após criá-las aqui.">
+<!ENTITY sendtophonePhoneAccounts.add "Adicionar novo">
+<!ENTITY sendtophonePhoneAccounts.rename "Renomear">
+<!ENTITY sendtophonePhoneAccounts.remove "Remover">
diff --git a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties
index ee34381..1c7642c 100644
--- a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties
@@ -21,3 +21,6 @@ qrContextMenu=Enviar "%s" para o Android
 FileUploadsDisabled=Não é possível enviar arquivos para o celular.
 FileTooBig=O arquivo é grande demais.
 videoTitle=Link para vídeo
+PhoneAccountPromptAdd=Favor informar o nome para a nova conta
+PhoneAccountPromptRename=Favor informar o novo nome para esta conta
+PhoneAccountPromptRemove=Tem certeza de que deseja apagar esta conta?
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index 5b3da2d..1a1f47d 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.2beta3</em:version>
+		<em:version>1.2beta4</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>
 
@@ -23,6 +23,7 @@
 		<em:contributor>LA (Russian)</em:contributor>
 		<em:contributor>yongdong7 (Chinese simplified)</em:contributor>
 		<em:contributor>Xutao (Chinese simplified)</em:contributor>
+		<em:contributor>Michał Jakubowski :: revanmj (Polish)</em:contributor>
 
 		<em:targetApplication>
 			<Description>
@@ -37,7 +38,7 @@
 				<!-- SeaMonkey -->
 				<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
 				<em:minVersion>2.1</em:minVersion>
-				<em:maxVersion>2.2.*</em:maxVersion>
+				<em:maxVersion>2.3.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/third_party/firefox_sendtophone/modules/OAuth.js b/third_party/firefox_sendtophone/modules/OAuth.js
index a46cdf2..62c4818 100644
--- a/third_party/firefox_sendtophone/modules/OAuth.js
+++ b/third_party/firefox_sendtophone/modules/OAuth.js
@@ -466,7 +466,7 @@ ChromeExOAuth.prototype.initOAuthFlow = function(callback) {
 	this.getRequestToken(function(url, error) {
 		if (error)
 		{
-			callback(error);
+			callback(null, null, error);
 			return;
 		}
 		openTab( url, request_params.url_callback, function( url )
diff --git a/third_party/firefox_sendtophone/modules/sendtophone.js b/third_party/firefox_sendtophone/modules/sendtophone.js
index e9ee34c..fb3daa9 100644
--- a/third_party/firefox_sendtophone/modules/sendtophone.js
+++ b/third_party/firefox_sendtophone/modules/sendtophone.js
@@ -303,7 +303,7 @@ var sendtophoneCore = {
 	{
 		this.popupNotification( this.getString("LoginRequired") );
 		//Open Google login page and close tab when done
-		this.oauth.initOAuthFlow( function(error) {
+		this.oauth.initOAuthFlow( function(token, secret, error) {
 			var self = sendtophoneCore;
 			if (error)
 			{