--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -38,18 +38,18 @@
 DEPTH     = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir = mobile/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-vpath %.xml $(srcdir)/$(MOZ_UI_LOCALE)/chrome/searchplugins
+vpath %.xml $(srcdir)/$(MOZ_UI_LOCALE)/searchplugins
 
 DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser
 
-SEARCH_PLUGINS = $(shell cat $(srcdir)/$(MOZ_UI_LOCALE)/chrome/searchplugins/list.txt)
+SEARCH_PLUGINS = $(shell cat $(srcdir)/$(MOZ_UI_LOCALE)/searchplugins/list.txt)
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
 include $(topsrcdir)/config/rules.mk

--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -13,22 +13,23 @@ browser.contentHandlers.types.1.title=My
 browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
 browser.contentHandlers.types.2.title=Google
 browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
 
 # Keyword URL (for location bar searches)
 keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
 
 # increment this number when anything gets changed in the list below.  This will
-# cause Firefox to re-read these prefs and inject any new handlers into the 
+# cause Firefox to re-read these prefs and inject any new handlers into the
 # profile database.  Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so 
+# means that it's not possible to update the name of existing handler, so
 # don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=1
+gecko.handlerService.defaultHandlersVersion=2
 
 # The default set of protocol handlers for webcal:
 gecko.handlerService.schemes.webcal.0.name=30 Boxes
 gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
 
 # The default set of protocol handlers for mailto:
 gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
-
+gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+gecko.handlerService.schemes.mailto.1.name=Gmail
+gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s

rename from mobile/locales/en-US/chrome/searchplugins/amazondotcom.xml
rename to mobile/locales/en-US/searchplugins/amazondotcom.xml

rename from mobile/locales/en-US/chrome/searchplugins/answers.xml
rename to mobile/locales/en-US/searchplugins/answers.xml

rename from mobile/locales/en-US/chrome/searchplugins/creativecommons.xml
rename to mobile/locales/en-US/searchplugins/creativecommons.xml

rename from mobile/locales/en-US/chrome/searchplugins/eBay.xml
rename to mobile/locales/en-US/searchplugins/eBay.xml

rename from mobile/locales/en-US/chrome/searchplugins/google.xml
rename to mobile/locales/en-US/searchplugins/google.xml

rename from mobile/locales/en-US/chrome/searchplugins/list.txt
rename to mobile/locales/en-US/searchplugins/list.txt

rename from mobile/locales/en-US/chrome/searchplugins/wikipedia.xml
rename to mobile/locales/en-US/searchplugins/wikipedia.xml

rename from mobile/locales/en-US/chrome/searchplugins/yahoo.xml
rename to mobile/locales/en-US/searchplugins/yahoo.xml