diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
index 66028fd..fceeddf 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
@@ -9,13 +9,22 @@
     <stringbundle id="sendtophone-strings" src="chrome://sendtophone/locale/overlay.properties"/>
   </stringbundleset>
 
-  <popupset id="mainPopupSet">
-	  <popup id="sendtophoneContextMenu" onpopupshowing="sendtophone.initPopup();">
-		<menuitem label="&sendtophoneContextLogout.label;" 
+	<popupset id="mainPopupSet">
+		<popup id="sendtophoneContextMenu" onpopupshowing="sendtophone.initPopup();">
+			<menuitem label="&sendtophoneContextLogout.label;" 
 				  accesskey="&sendtophoneContextLogout.accesskey;"
 				  oncommand="sendtophone.logout()" id="sendtophoneContextMenuLogout"/>
-	  </popup>
-  </popupset>
+			<menu label="&sendtophoneProtocols.label;">
+				<menupopup id="menu_Protocols" onpopupshowing="sendtophone.onOptionsShowing(this)"> 
+					<menuitem type="checkbox" id="marketcheck" label="market:" oncommand="sendtophone.onToggleOption(this)" option="market"/>
+					<menuitem type="checkbox" id="mmscheck" label="mms:"  oncommand="sendtophone.onToggleOption(this)" option="mms"/>
+					<menuitem type="checkbox" id="smscheck" label="sms:"  oncommand="sendtophone.onToggleOption(this)" option="sms"/>
+					<menuitem type="checkbox" id="telcheck" label="tel:"  oncommand="sendtophone.onToggleOption(this)" option="tel"/>
+				</menupopup>
+			</menu>
+		</popup>
+	  
+	</popupset>
 
   <popup id="contentAreaContextMenu">
     <menuitem id="context-sendtophone-link" label="&sendtophoneContext.label;"
@@ -36,22 +45,11 @@
               oncommand="sendtophone.onMenuItemCommand(event, 'page')"/>
   </popup>
 
-  <menupopup id="menu_ToolsPopup"> 
-	<menu label="SendToPhone Protocols" insertafter="devToolsSeparator" >
-		<menupopup id="menu_Protocols" onpopupshowing="sendtophone.onOptionsShowing(this)"> 
-			<menuitem type="checkbox" id="marketcheck" label="market://" oncommand="sendtophone.onToggleOption(this)" option="market"/>
-			<menuitem type="checkbox" id="smscheck" label="sms://"  oncommand="sendtophone.onToggleOption(this)" option="sms"/>
-			<menuitem type="checkbox" id="mmscheck" label="mms://"  oncommand="sendtophone.onToggleOption(this)" option="mms"/>
-			<menuitem type="checkbox" id="telcheck" label="tel://"  oncommand="sendtophone.onToggleOption(this)" option="tel"/>
-		</menupopup>
-	</menu>
-  </menupopup>
-
-  <toolbarpalette id="BrowserToolbarPalette">
-  <toolbarbutton id="sendtophone-toolbar-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-    label="&sendtophoneToolbarButton.label;" tooltiptext="&sendtophoneToolbarButton.tooltip;"
-	context="sendtophoneContextMenu"
-    oncommand="sendtophone.onToolbarButtonCommand()"/>
-  </toolbarpalette>
+	<toolbarpalette id="BrowserToolbarPalette">
+		<toolbarbutton id="sendtophone-toolbar-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+		label="&sendtophoneToolbarButton.label;" tooltiptext="&sendtophoneToolbarButton.tooltip;"
+		context="sendtophoneContextMenu"
+		oncommand="sendtophone.onToolbarButtonCommand()"/>
+	</toolbarpalette>
 
 </overlay>
diff --git a/third_party/firefox_sendtophone/chrome/content/options.xul b/third_party/firefox_sendtophone/chrome/content/options.xul
new file mode 100644
index 0000000..9f2ea5b
--- /dev/null
+++ b/third_party/firefox_sendtophone/chrome/content/options.xul
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://sendtophone/locale/overlay.dtd">
+
+<prefwindow id="sendtophone-prefs"
+     title="&sendtophoneOptions.title;"
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+	<prefpane>
+		<preferences>
+			<preference id="extensions.sendtophone.protocols.market" name="extensions.sendtophone.protocols.market" type="bool"/>
+			<preference id="extensions.sendtophone.protocols.sms" name="extensions.sendtophone.protocols.sms" type="bool"/>
+			<preference id="extensions.sendtophone.protocols.smsto" name="extensions.sendtophone.protocols.smsto" type="bool"/>
+			<preference id="extensions.sendtophone.protocols.mms" name="extensions.sendtophone.protocols.mms" type="bool"/>
+			<preference id="extensions.sendtophone.protocols.mmsto" name="extensions.sendtophone.protocols.mmsto" type="bool"/>
+			<preference id="extensions.sendtophone.protocols.tel" name="extensions.sendtophone.protocols.tel" type="bool"/>
+		</preferences>
+		
+		<groupbox style="padding:1em;" label="ProtocolsGroup">
+			<caption label="&sendtophoneProtocols.label;"/>
+		
+				<checkbox preference="extensions.sendtophone.protocols.market"
+					label="market:" />
+					
+				<checkbox preference="extensions.sendtophone.protocols.mms"
+					label="mms:" oncommand="var o = document.getElementById('mmsto'); o.checked=this.checked; o.doCommand();" />
+				<checkbox id="mmsto" preference="extensions.sendtophone.protocols.mmsto"
+					label="mmsto:" style="display:none" />
+					
+				<checkbox id="sms" preference="extensions.sendtophone.protocols.sms"
+					label="sms:" oncommand="var o = document.getElementById('smsto'); o.checked=this.checked; o.doCommand();"  />
+				<checkbox id="smsto" preference="extensions.sendtophone.protocols.smsto"
+					label="smsto:" style="display:none"/>
+					
+				<checkbox preference="extensions.sendtophone.protocols.tel"
+					label="tel:" />
+		</groupbox>
+	
+	</prefpane>
+
+</prefwindow>
\ No newline at end of file
diff --git a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
index b2d9d4d..3c8be86 100644
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
index d51e060..1b9445b 100644
--- a/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/en/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
index 7383cfe..9b7a2a5 100644
--- a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Salir">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Opciones de Send to Phone">
+<!ENTITY sendtophoneProtocols.label "Protocolos">
\ No newline at end of file
diff --git a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
index 586911b..d88fc9e 100644
--- a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
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 02fd47c..34f8338 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
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 7270e0a..5901368 100644
--- a/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
index 8b0fd11..9e79b3f 100644
--- a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
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 6655a95..182ef81 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
index 83946e6..1f9c952 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Afmelden">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
index da9cb58..67141eb 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Выйти">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
index fb4c4a9..ce5e41d 100644
--- a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
@@ -10,4 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logga ut">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
-
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
index ea8b992..eb56d40 100644
--- a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
@@ -10,3 +10,5 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Logout">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Send to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
diff --git a/third_party/firefox_sendtophone/defaults/preferences/prefs.js b/third_party/firefox_sendtophone/defaults/preferences/prefs.js
index 9e1ecdd..1f8d516 100644
--- a/third_party/firefox_sendtophone/defaults/preferences/prefs.js
+++ b/third_party/firefox_sendtophone/defaults/preferences/prefs.js
@@ -6,7 +6,7 @@ pref("extensions.sendtophone.proxyUrl", "http://smallroomstudios.net/s2p.php?ml=
 pref("extensions.sendtophone.protocols.market", true);
 pref("extensions.sendtophone.protocols.sms", true);
 pref("extensions.sendtophone.protocols.smsto", true);
-pref("extensions.sendtophone.protocols.mms", true);
+pref("extensions.sendtophone.protocols.mms", false); // conflicts with http://en.wikipedia.org/wiki/Microsoft_Media_Server
 pref("extensions.sendtophone.protocols.mmsto", true);
 pref("extensions.sendtophone.protocols.tel", true);
 
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index 0f6ea3c..dabaa9d 100644
--- a/third_party/firefox_sendtophone/install.rdf
+++ b/third_party/firefox_sendtophone/install.rdf
@@ -10,6 +10,8 @@
     <em:description>Send links to your Android 2.2 phone using the new C2DM service. Based on the ChromeToPhone extension.</em:description>
     <em:aboutURL>chrome://sendtophone/content/about.xul</em:aboutURL>
 	<em:iconURL>chrome://sendtophone/skin/icon.png</em:iconURL>
+	<em:optionsURL>chrome://sendtophone/content/options.xul</em:optionsURL>
+
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->