diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index b40f690fd9cd..6c662356e185 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -57,6 +57,12 @@ XPCOMUtils.defineLazyGetter(this, "Sanitizer", function() {
   return Sanitizer;
 });
 
+XPCOMUtils.defineLazyGetter(this, "Prompt", function() {
+  let temp = {};
+  Cu.import("resource://gre/modules/Prompt.jsm", temp);
+  return temp.Prompt;
+});
+
 // Lazily-loaded browser scripts:
 [
   ["HelperApps", "chrome://browser/content/HelperApps.js"],
diff --git a/mobile/android/modules/Makefile.in b/mobile/android/modules/Makefile.in
index 143e188453f7..14156b254420 100644
--- a/mobile/android/modules/Makefile.in
+++ b/mobile/android/modules/Makefile.in
@@ -15,6 +15,7 @@ EXTRA_JS_MODULES = \
   OrderedBroadcast.jsm \
   Sanitizer.jsm \
   SharedPreferences.jsm \
+  Prompt.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/modules/Prompt.jsm b/mobile/android/modules/Prompt.jsm
new file mode 100644
index 000000000000..1e9acb4b858b
--- /dev/null
+++ b/mobile/android/modules/Prompt.jsm
@@ -0,0 +1,169 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict"
+
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+this.EXPORTED_SYMBOLS = ["Prompt"];
+
+function log(msg) {
+  //Services.console.logStringMessage(msg);
+}
+
+function Prompt(aOptions) {
+  this.window = "window" in aOptions ? aOptions.window : null;
+  this.msg = { type: "Prompt:Show", async: true };
+
+  if ("title" in aOptions)
+    this.msg.title = aOptions.title;
+
+  if ("message" in aOptions)
+    this.msg.text = aOptions.message;
+
+  if ("buttons" in aOptions)
+    this.msg.buttons = aOptions.buttons;
+
+  let idService = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator); 
+  this.guid = idService.generateUUID().toString();
+  this.msg.guid = this.guid;
+}
+
+Prompt.prototype = {
+  addButton: function(aOptions) {
+    if (!this.msg.buttons)
+      this.msg.buttons = [];
+    this.msg.buttons.push(aOptions.label);
+    return this;
+  },
+
+  _addInput: function(aOptions) {
+    let obj = aOptions;
+    if (this[aOptions.type + "_count"] === undefined)
+      this[aOptions.type + "_count"] = 0;
+
+    obj.id = aOptions.id || (aOptions.type + this[aOptions.type + "_count"]);
+    this[aOptions.type + "_count"]++;
+
+    this.msg.inputs.push(obj);
+    return this;
+  },
+
+  addCheckbox: function(aOptions) {
+    return this._addInput({
+      type: "checkbox",
+      label: aOptions.label,
+      checked: aOptions.checked,
+      id: aOptions.id
+    });
+  },
+
+  addTextbox: function(aOptions) {
+    return this._addInput({
+      type: "textbox",
+      value: aOptions.value,
+      hint: aOptions.hint,
+      autofocus: aOptions.autofocus,
+      id: aOptions.id
+    });
+  },
+
+  addPassword: function(aOptions) {
+    return this._addInput({
+      type: "password",
+      value: aOptions.value,
+      hint: aOptions.hint,
+      autofocus: aOptions.autofocus,
+      id : aOptions.id
+    });
+  },
+
+  addMenulist: function(aOptions) {
+    return this._addInput({
+      type: "menulist",
+      values: aOptions.values,
+      id: aOptions.id
+    });
+  },
+
+  show: function(callback) {
+    this.callback = callback;
+    log("Sending message");
+    Services.obs.addObserver(this, "Prompt:Reply", false);
+    this._innerShow();
+  },
+
+  _innerShow: function() {
+    this.bridge.handleGeckoMessage(JSON.stringify(this.msg));
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    log("observe " + aData);
+    let data = JSON.parse(aData);
+    if (data.guid != this.guid)
+      return;
+
+    Services.obs.removeObserver(this, "Prompt:Reply", false);
+
+    if (this.callback)
+      this.callback(data);
+  },
+
+  _setListItems: function(aItems, aInGroup) {
+    let hasSelected = false;
+    if (!aInGroup)
+      this.msg.listitems = [];
+
+    aItems.forEach(function(item) {
+      let obj = { id: item.id };
+
+      if (aInGroup !== undefined)
+        obj.inGroup = aInGroup;
+
+      obj.label = item.label;
+
+      if (item.disabled)
+        obj.disabled = true;
+
+      if (item.selected || hasSelected || this.msg.multiple) {
+        if (!this.msg.selected) {
+          this.msg.selected = new Array(this.msg.listitems.length);
+          hasSelected = true;
+        }
+        this.msg.selected[this.msg.listitems.length] = item.selected;
+      }
+
+      if (item.children) {
+        obj.isGroup = true;
+      } else if (item.submenu) {
+        obj.isParent = true;
+      }
+
+      // Order matters in the java message, so make sure we add the obj
+      // to the list before we add its children
+      this.msg.listitems.push(obj);
+
+      if (item.children)
+        this._setListItems(item.children, true);
+
+    }, this);
+    return this;
+  },
+
+  setSingleChoiceItems: function(aItems) {
+    return this._setListItems(aItems);
+  },
+
+  setMultiChoiceItems: function(aItems) {
+    this.msg.multiple = true;
+    return this._setListItems(aItems);
+  },
+
+  get bridge() {
+    return Cc["@mozilla.org/android/bridge;1"].getService(Ci.nsIAndroidBridge);
+  },
+
+}