diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
new file mode 100644
index 000000000..d4f5be640
--- /dev/null
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -0,0 +1,649 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2009 Center for History and New Media
+				     George Mason University, Fairfax, Virginia, USA
+				     http://zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
+var Zotero_QuickFormat = new function () {
+	var io, qft, qftWindow, qftDocument, qfe,
+		qfb, qfbHeight,
+		referenceBox, referenceHeight,
+		dragX, dragY, curLocator, curLocatorLabel,
+		curIDs = [], curResizer, dragging;
+	const SHOWN_REFERENCES = 7;
+	
+	/**
+	 * Initialize add citation dialog
+	 */
+	this.onLoad = function() {
+		qft = document.getElementById("quick-format-search");
+		qfb = document.getElementById("quick-format-entry");
+		qfbHeight = qfb.scrollHeight;
+		referenceBox = document.getElementById("quick-format-reference-list");
+		qftWindow = qft.contentWindow;
+		qftDocument = qft.contentDocument;
+		qfb.addEventListener("keypress", _onQuickSearchKeyPress, false);
+		qfe = qftDocument.getElementById("quick-format-editor");
+		qfe.focus();
+		
+		// Add labels to popup
+		var locators = Zotero.Cite.labels;
+		var menu = document.getElementById("locator-label");
+		var labelList = document.getElementById("locator-label-popup");
+		for each(var locator in locators) {
+			// TODO localize
+			var locatorLabel = locator[0].toUpperCase()+locator.substr(1);
+			
+			// add to list of labels
+			var child = document.createElement("menuitem");
+			child.setAttribute("value", locator);
+			child.setAttribute("label", locatorLabel);
+			labelList.appendChild(child);
+		}
+		menu.selectedIndex = 0;
+		
+		// load citation data
+		io = window.arguments[0].wrappedJSObject;
+		if(io.citation.citationItems.length) {
+			// hack to get spacing right
+			var evt = qftDocument.createEvent("KeyboardEvent");
+			evt.initKeyEvent("keypress", true, true, qftWindow,
+				0, 0, 0, 0,
+				0, " ".charCodeAt(0))
+			qfe.dispatchEvent(evt);
+			window.setTimeout(function() {
+				var node = qfe.firstChild;
+				node.nodeValue = "";
+
+				for(var i=0; i<io.citation.citationItems.length; i++) {
+					_insertBubble(io.citation.citationItems[i], node);
+				}
+			}, 1);
+		}
+	};
+	
+	/**
+	 * Gets the content of the text node that the cursor is currently within
+	 */
+	function _getCurrentEditorTextNode() {
+		var selection = qftWindow.getSelection();
+		var range = selection.getRangeAt(0);
+		
+		var node = range.startContainer;
+		if(node !== range.endContainer || node.nodeType !== Node.TEXT_NODE ) {
+			return false;
+		}
+		
+		return node;
+	}
+	
+	/**
+	 * Gets text within the currently selected node
+	 * @param {Boolean} [clear] If true, also remove these nodes
+	 */
+	function _getEditorContent(clear) {
+		var node = _getCurrentEditorTextNode();
+		return node ? node.textContent : false;
+	}
+	
+	/**
+	 * Does the dirty work of figuring out what the user meant to type
+	 */
+	function _quickFormat() {
+		var str = _getEditorContent();
+		if(!str || str.length === 1) {
+			// if only one char or no string, remove references and break
+			while(referenceBox.hasChildNodes()) referenceBox.removeChild(referenceBox.firstChild);
+			_resize();
+			return;
+		}
+		
+		const specifiedLocatorRe = /,? *(pp|p)(?:\. *| +)([0-9\-]+) *$/;
+		const yearPageLocatorRe = /,? *([0-9]+) *((B[. ]*C[. ]*|B[. ]*)|[AC][. ]*|A[. ]*D[. ]*|C[. ]*E[. ]*)?,? *(?:([0-9\-]+))?$/i;
+		const creatorSplitRe = /(?:,| *(?:and|\&)) +/;
+		const charRe = /[\w\u007F-\uFFFF]/;
+		const etAl = " et al.";
+		
+		var m,
+			year = false,
+			isBC = false,
+			dateID = false;
+		
+		curLocator = false;
+		curLocatorLabel = false;
+		
+		// check for specified locator
+		m = specifiedLocatorRe.exec(str);
+		if(m) {
+			if(m.index === 0) {
+				// add to previous cite
+				var node = _getCurrentEditorTextNode();
+				var prevNode = node.previousSibling;
+				if(prevNode && prevNode.citationItem) {
+					prevNode.citationItem.locator = m[2];
+					prevNode.value = _buildBubbleString(prevNode.citationItem);
+					node.nodeValue = "";
+					_clearEntryList();
+					return;
+				}
+			}
+			
+			// TODO support types other than page
+			curLocator = m[2];
+			str = str.substring(0, m.index);
+		}
+		
+		// check for year and pages
+		m = yearPageLocatorRe.exec(str);
+		if(m) {
+			if(m[1].length === 4 || m[2] || m[4]) {
+				year = parseInt(m[1]);
+				if(m[3]) {
+					isBC = true;
+				}
+				if(!curLocator && m[4]) {
+					curLocator = m[4];
+				}
+			} else {
+				curLocator = m[1];
+			}
+			
+			str = str.substr(0, m.index)+str.substring(m.index+m[0].length);
+		}
+		
+		var s = new Zotero.Search();
+		
+		if(charRe.test(str)) {
+			Zotero.debug("QuickFormat: QuickSearch: "+str);
+			try {
+				s.addCondition("quicksearch-titlesAndCreators", "contains", str);
+			} catch(e) {
+				Zotero.debug(e.toString());
+			}
+			haveConditions = true;
+		}
+		
+		if(year) {
+			Zotero.debug("QuickFormat: Year: "+year);
+			s.addCondition("date", "isAfter", (year-1)+"-12-31 23:59:59");
+			s.addCondition("date", "isBefore", (year+1)+"-01-01 00:00:00");
+			haveConditions = true;
+		}
+		
+		var ids = (haveConditions ? s.search() : []);
+		
+		// no need to refresh anything if box hasnt changed
+		if(ids.length === curIDs.length) {
+			var mismatch = false;
+			for(var i=0; i<ids.length; i++) {
+				if(curIDs[i] !== ids[i]) {
+					mismatch = true;
+					break;
+				}
+			}
+			if(!mismatch) return;
+		}
+		curIDs = ids;
+		
+		while(referenceBox.hasChildNodes()) referenceBox.removeChild(referenceBox.firstChild);
+		
+		if(ids.length) {
+			if(ids.length > 50) ids = ids.slice(0, 50);
+			var items = Zotero.Items.get(ids);
+			for(var i=0, n=items.length; i<n; i++) {
+				referenceBox.appendChild(_buildListItem(items[i]));
+			}
+			referenceBox.ensureIndexIsVisible(0);
+		}
+		
+		_resize();
+		
+		referenceBox.selectedIndex = 0;
+	}
+	
+	/**
+	 * Creates an item to be added to the item list
+	 */
+	function _buildListItem(item) {
+		var titleNode = document.createElement("label");
+		titleNode.setAttribute("class", "quick-format-title");
+		titleNode.setAttribute("flex", "1");
+		titleNode.setAttribute("crop", "end");
+		titleNode.setAttribute("value", item.getDisplayTitle());
+		
+		var infoNode = document.createElement("hbox");
+		infoNode.setAttribute("class", "quick-format-info");
+		
+		var nodes = [];
+		
+		// do some basic bibliography formatting; not using CSL here for speed
+		var author, authorDate = "";
+		if(item.firstCreator) author = authorDate = item.firstCreator;
+		var date = item.getField("date", true);
+		if(date && (date = date.substr(0, 4)) !== "0000") {
+			authorDate += " ("+date+")";
+		}
+		authorDate = authorDate.trim();
+		if(authorDate) nodes.push(authorDate);
+		
+		var publicationTitle = item.getField("publicationTitle", false, true);
+		if(publicationTitle) {
+			var label = document.createElement("label");
+			label.setAttribute("value", publicationTitle);
+			label.setAttribute("crop", "end");
+			label.style.fontStyle = "italic";
+			nodes.push(label);
+		}
+		
+		var volumeIssue = item.getField("volume");
+		var issue = item.getField("issue");
+		if(issue) volumeIssue += "("+issue+")";
+		if(volumeIssue) nodes.push(volumeIssue);
+		
+		var publisherPlace = [], field;
+		if((field = item.getField("publisher"))) publisherPlace.push(field);
+		if((field = item.getField("place"))) publisherPlace.push(field);
+		if(publisherPlace.length) nodes.push(publisherPlace.join(": "));
+		
+		var pages = item.getField("pages");
+		if(pages) nodes.push(pages);
+		
+		if(!nodes.length) {
+			var url = item.getField("url");
+			if(url) nodes.push(url);
+		}
+		
+		// compile everything together
+		var str = "";
+		for(var i=0, n=nodes.length; i<n; i++) {
+			var node = nodes[i];
+			
+			if(i != 0) str += ", ";
+			
+			if(typeof node === "object") {
+				var label = document.createElement("label");
+				label.setAttribute("value", str);
+				label.setAttribute("crop", "end");
+				infoNode.appendChild(label);
+				infoNode.appendChild(node);
+				str = "";
+			} else {
+				str += node;
+			}
+		}
+		
+		if(nodes.length && (!str.length || str[str.length-1] !== ".")) str += "."
+		
+		if(str) {
+			var label = document.createElement("label");
+			label.setAttribute("value", str);
+			label.setAttribute("crop", "end");
+			label.setAttribute("flex", "1");
+			infoNode.appendChild(label);
+		}
+		
+		// add to rich list item
+		var rll = document.createElement("richlistitem");
+		rll.setAttribute("orient", "vertical");
+		rll.setAttribute("flex", "1");
+		rll.setAttribute("class", "quick-format-item");
+		rll.setAttribute("zotero-item", item.id);
+		rll.appendChild(titleNode);
+		rll.appendChild(infoNode);
+		rll.addEventListener("click", _bubbleizeSelected, false);
+		
+		return rll;
+	}
+	
+	/**
+	 * Builds the string to go inside a bubble
+	 */
+	function _buildBubbleString(citationItem) {
+		var item = Zotero.Items.get(citationItem.id);
+		// create text for bubble
+		var title, delimiter;
+		var str = item.getField("firstCreator");
+		if(!str) {
+			// TODO localize quotes
+			str = '"'+item.getField("title")+'"';
+		}
+		
+		var date = item.getField("date", true);
+		if(date && (date = date.substr(0, 4)) !== "0000") {
+			str += ", "+date;
+		}
+		
+		if(citationItem.locator) {
+			str += ", "+(citationItem.locator.indexOf("-") !== -1 || citationItem.locator.indexOf("–") !== -1 ? "pp" : "p")+". "+citationItem.locator;
+		}
+		
+		return str;
+	}
+	
+	/**
+	 * Insert a bubble into the DOM at a specified position
+	 */
+	function _insertBubble(citationItem, nextNode) {
+		var str = _buildBubbleString(citationItem);
+		
+		// It's entirely unintuitive why, but after trying a bunch of things, it looks like using
+		// a XUL label for these things works best. A regular span causes issues with moving the
+		// cursor.
+		var bubble = qftDocument.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "label");
+		bubble.setAttribute("class", "quick-format-bubble");
+		bubble.setAttribute("value", str);
+		bubble.addEventListener("click", _onBubbleClick, false);
+		bubble.addEventListener("dragstart", _onBubbleDrag, false);
+		bubble.addEventListener("dragend", _onBubbleDrop, false);
+		bubble.citationItem = citationItem;
+		qfe.insertBefore(bubble, (nextNode ? nextNode : null));
+		
+		// make sure that there are no rogue <br>s
+		var elements = qfe.getElementsByTagName("br");
+		for(var i=0, n=elements.length; i<n; i++) {
+			elements[i].parentNode.removeChild(elements[i]);
+		}
+		return bubble;
+	}
+	
+	/**
+	 * Clear list of bubbles
+	 */
+	function _clearEntryList() {
+		while(referenceBox.hasChildNodes()) referenceBox.removeChild(referenceBox.firstChild);
+		_resize();
+	}
+	
+	/**
+	 * Converts the selected item to a bubble
+	 */
+	function _bubbleizeSelected() {
+		if(!referenceBox.hasChildNodes() || !referenceBox.selectedItem) return false;
+		
+		var citationItem = {"id":referenceBox.selectedItem.getAttribute("zotero-item")};
+		if(curLocator) {
+			 citationItem["locator"] = curLocator;
+			if(curLocatorLabel) {
+				citationItem["label"] = curLocatorLabel;
+			}
+		}
+		
+		// get next node and clear this one
+		var node = _getCurrentEditorTextNode();
+		node.nodeValue = "";
+		var bubble = _insertBubble(citationItem, node);
+		_clearEntryList();
+		
+		return true;
+	}
+	
+	/**
+	 * Resizes window to fit content
+	 */
+	function _resize() {
+		var numReferences = referenceBox.childNodes.length, height;
+		var qfeHeight = qfe.scrollHeight;
+		if(numReferences) {
+			referenceBox.hidden = false;
+			if(!referenceHeight) {
+				referenceHeight = referenceBox.firstChild.scrollHeight;
+			}		
+			height = qfbHeight+qfeHeight-14+
+				+(numReferences < SHOWN_REFERENCES ? numReferences : SHOWN_REFERENCES)*referenceHeight;
+		} else {
+			referenceBox.hidden = true;
+			height = qfbHeight+qfeHeight-14;
+		}
+		
+		if(height === window.innerHeight) return;
+		if(qfeHeight > 20) {
+			qft.style.height = (22-16+qfeHeight+(qft.style.height == "22px" ? 2 : -2))+"px";
+			qfe.style.lineHeight = "18px";
+			qft.setAttribute("multiline", true);
+		} else {
+			qft.style.height = "22px";
+			qfe.style.lineHeight = "16px";
+			qft.removeAttribute("multiline");
+		}
+		if(curResizer) curResizer.stop();
+		curResizer = new Resizer(window, null, height, 10, 100);
+		curResizer.animate();
+	}
+	
+	/**
+	 * Accepts current selection and adds citation
+	 */
+	_accept = function() {
+		var nodes = qfe.childNodes;
+		io.citation.citationItems = [];
+		for(var i=0, n=nodes.length; i<n; i++) {
+			if(nodes[i].citationItem) io.citation.citationItems.push(nodes[i].citationItem);
+		}
+		window.close();
+	}
+	
+	/**
+	 * Handle escape for entire window
+	 */
+	this.onKeyPress = function(event) {
+		var keyCode = event.keyCode;
+		if(keyCode === event.DOM_VK_ESCAPE) {
+			window.close();
+		}
+	}
+	
+	/**
+	 * Handle return or escape
+	 */
+	function _onQuickSearchKeyPress(event) {
+		try {
+			var keyCode = event.keyCode;
+			if(keyCode === event.DOM_VK_RETURN || keyCode === event.DOM_VK_ENTER) {
+				event.preventDefault();
+				if(!_bubbleizeSelected()) {
+					_accept();
+				}
+			} else if(keyCode === event.DOM_VK_TAB || event.charCode === 59 /* ; */) {
+				event.preventDefault();
+				_bubbleizeSelected();
+			} else if(keyCode === event.DOM_VK_UP) {
+				var selectedItem = referenceBox.selectedItem;
+				var previousSibling;
+				if((previousSibling = selectedItem.previousSibling)) {
+					referenceBox.selectedItem = previousSibling;
+					referenceBox.ensureElementIsVisible(previousSibling);
+					event.preventDefault();
+				};
+			} else if(keyCode === event.DOM_VK_DOWN) {
+				var selectedItem = referenceBox.selectedItem;
+				var nextSibling;
+				if((nextSibling = selectedItem.nextSibling)) {
+					referenceBox.selectedItem = nextSibling;
+					referenceBox.ensureElementIsVisible(nextSibling);
+					event.preventDefault();
+				};
+			} else {
+				// Use a timeout so that _quickFormat gets called after update
+				window.setTimeout(_quickFormat, 0);
+			}
+		} catch(e) {
+			Zotero.logError(e);
+		}
+	}
+	
+	/**
+	 * Adds a dummy element to make dragging work
+	 */
+	function _onBubbleDrag(event) {
+		// just in case
+		var el = qftDocument.getElementById("zotero-drag");
+		if(el) el.parentNode.removeChild(el);
+		
+		var dt = event.dataTransfer;
+		dragging = event.target.citationItem;
+		dt.setData("text/html", '<span id="zotero-drag"/>');
+		event.stopPropagation();
+	}
+	
+	/**
+	 * Replaces the dummy element with a node to make dropping work
+	 */
+	function _onBubbleDrop(event) {
+		window.setTimeout(function() {
+			var el = qftDocument.getElementById("zotero-drag");
+			if(el) {
+				_insertBubble(dragging, el);
+				Zotero.debug(dragging);
+				el.parentNode.removeChild(el);
+			}
+		}, 0);
+	}
+	
+	/**
+	 * Handle a click on a bubble
+	 */
+	function _onBubbleClick(event) {
+		var target = event.target;
+		var panel = document.getElementById("citation-properties");
+		var prefix = document.getElementById("prefix");
+		var suffix = document.getElementById("suffix");
+		var suppressAuthor = document.getElementById("suppress-author");
+		var locatorLabel = document.getElementById("locator-label");
+		var locator = document.getElementById("locator");
+		
+		prefix.value = target.citationItem["prefix"] ? target.citationItem["prefix"] : "";
+		suffix.value = target.citationItem["suffix"] ? target.citationItem["suffix"] : "";
+		if(target.citationItem["label"]) {
+			var option = locatorLabel.getElementsByAttribute("value", target.citationItem["label"]);
+			if(option.length) {
+				locatorLabel.selectedItem = option[0];
+			} else {
+				locatorLabel.selectedIndex = 0;
+			}
+		} else {
+			locatorLabel.selectedIndex = 0;
+		}
+		locator.value = target.citationItem["locator"] ? target.citationItem["locator"] : "";
+		suppressAuthor.checked = !!target.citationItem["suppress-author"];
+		
+		target.setAttribute("selected", "true");
+		panel.openPopup(target, "after_start",
+			target.clientWidth/2, 0, false, false, event);
+		
+		var closeListener = function(event) {
+			panel.removeEventListener("popuphidden", closeListener, false);
+			target.removeAttribute("selected");
+			if(prefix.value) {
+				target.citationItem["prefix"] = prefix.value;
+			} else {
+				delete target.citationItem["prefix"];
+			}
+			if(suffix.value) {
+				target.citationItem["suffix"] = suffix.value;
+			} else {
+				delete target.citationItem["suffix"];
+			}
+			if(locatorLabel.selectedIndex !== 0) {
+				target.citationItem["label"] = locatorLabel.selectedItem.value;
+			} else {
+				delete target.citationItem["label"];
+			}
+			if(locator.value) {
+				target.citationItem["locator"] = locator.value;
+			} else {
+				delete target.citationItem["locator"];
+			}
+			if(suppressAuthor.checked) {
+				target.citationItem["suppress-author"] = true;
+			} else {
+				delete target.citationItem["suppress-author"];
+			}
+			target.value = _buildBubbleString(target.citationItem);
+		}
+		panel.addEventListener("popuphidden", closeListener, false);
+	}
+	
+	/**
+	 * Called when the user begins to drag the window
+	 */
+	this.onDragStart = function(el, event) {
+		dragX = event.clientX;
+		dragY = event.clientY;
+		window.addEventListener("mousemove", _onDrag, false);
+		window.addEventListener("mouseup", function() { window.removeEventListener("mousemove", _onDrag, false) }, false);
+	}
+	
+	/**
+	 * Called during the window drag
+	 */
+	function _onDrag(event) {
+		window.moveTo(event.screenX-dragX, event.screenY-dragY);
+	}
+	
+	/**
+	 * Makes "Enter" work in the panel
+	 */
+	this.onPanelKeyPress = function(event) {
+		if(keyCode === event.DOM_VK_RETURN || keyCode === event.DOM_VK_ENTER) {
+			event.target.hidePopup();
+		}
+	};
+	
+	/**
+	 * Resizes windows
+	 * @constructor
+	 */
+	var Resizer = function(window, targetWidth, targetHeight, steps, time) {
+		this.curWidth = window.innerWidth;
+		this.curHeight = window.innerHeight;
+		this.difX = (targetWidth ? targetWidth - this.curWidth : 0);
+		this.difY = (targetHeight ? targetHeight - this.curHeight : 0);
+		this.step = 0;
+		this.steps = steps;
+		this.timeout = time/steps;
+		
+		var me = this;
+		this._animateCallback = function() { me.animate() };
+	};
+	
+	/**
+	 * Performs a step of the animation
+	 */
+	Resizer.prototype.animate = function() {
+		if(this.stopped) return;
+		this.step++;
+		window.resizeTo(this.curWidth+Math.round(this.step*this.difX/this.steps),
+			this.curHeight+Math.round(this.step*this.difY/this.steps));
+		if(this.step !== this.steps) {
+			window.setTimeout(this._animateCallback, this.timeout);
+		}
+	};
+	
+	/**
+	 * Halts resizing
+	 */
+	Resizer.prototype.stop = function() {
+		this.stopped = true;
+	};
+}
+
+window.addEventListener("load", Zotero_QuickFormat.onLoad, false);
\ No newline at end of file
diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul
new file mode 100644
index 000000000..8f6b18f27
--- /dev/null
+++ b/chrome/content/zotero/integration/quickFormat.xul
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2011 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+-->
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/integration.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
+
+<window
+	id="zotero-quick-format-dialog"
+	orient="vertical"
+	title="Quick Format Citation"
+	width="500" height="44"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	persist="screenX screenY"
+	style="background: transparent; -moz-appearance:none; padding: 0"
+	hidechrome="true" onkeypress="Zotero_QuickFormat.onKeyPress(event)">
+	
+	<script src="../include.js"/>
+	<script src="quickFormat.js"/>
+	
+	<vbox id="zotero-select-items-container" flex="1">
+		<hbox id="quick-format-entry" ondragstart="Zotero_QuickFormat.onDragStart(this, event)"> 
+			<!-- javascript:encodeURIComponent('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><link rel="stylesheet" type="text/css" href="chrome://zotero/skin/integration.css"/></head><body id="quick-format-editor"/></html>') -->
+			<iframe id="quick-format-search" ondragstart="event.stopPropagation()" src="data:application/xhtml+xml,%3C!DOCTYPE%20html%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20XHTML%201.0%20Strict%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd%22%3E%3Chtml%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxhtml%22%3E%3Chead%3E%3Clink%20rel%3D%22stylesheet%22%20type%3D%22text%2Fcss%22%20href%3D%22chrome%3A%2F%2Fzotero%2Fskin%2Fintegration.css%22%2F%3E%3C%2Fhead%3E%3Cbody%20contenteditable%3D%22true%22%20id%3D%22quick-format-editor%22%2F%3E%3C%2Fhtml%3E"
+				tabindex="1" flex="1"/>
+		</hbox>
+		<richlistbox id="quick-format-reference-list" hidden="true" flex="1"/>
+	</vbox>
+	<panel id="citation-properties" type="arrow" orient="vertical" onkeypress="Zotero_QuickStart.onPanelKeyPress(event)">
+		<grid flex="1">
+			<columns>
+				<column/>
+				<column flex="1"/>
+			</columns>
+			<rows>
+				<row align="center">
+					<label value="&zotero.citation.prefix.label;"/>
+					<textbox class="citation-textbox" id="prefix" flex="1"/>
+				</row>
+				<row align="center">
+					<label value="&zotero.citation.suffix.label;"/>
+					<textbox class="citation-textbox" id="suffix" flex="1"/>
+				</row>
+				<row align="center">
+					<menulist id="locator-label" sizetopopup="none">
+						<menupopup id="locator-label-popup"/>
+					</menulist>
+					<textbox id="locator" flex="1"/>
+				</row>
+				<checkbox id="suppress-author" label="&zotero.citation.suppressAuthor.label;"/>
+			</rows>
+		</grid>
+	</panel>
+</window>
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index c75ea060d..3e0519d54 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1803,7 +1803,11 @@ Zotero.Integration.Session.prototype.editCitation = function(index, noteIndex, c
 	// citeproc-js style object for use of third-party extension
 	io.style = this.style;
 	
-	this._displayDialog('chrome://zotero/content/integration/addCitationDialog.xul', 'resizable', io);
+	if(Zotero.Prefs.get("integration.quickFormat")) {
+		this._displayDialog('chrome://zotero/content/integration/quickFormat.xul', io);
+	} else {
+		this._displayDialog('chrome://zotero/content/integration/addCitationDialog.xul', 'resizable', io);
+	}
 	
 	if(io.citation.citationItems.length) {		// we have an item
 		this.addCitation(index, noteIndex, io.citation);
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
index ccb809d04..9932650ea 100644
--- a/chrome/skin/default/zotero/integration.css
+++ b/chrome/skin/default/zotero/integration.css
@@ -1,3 +1,34 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2011 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    Parts of this code are derived from mozilla.org code.
+    
+    The Initial Developer of this Original Code is Netscape Communications Corporation.
+    Portions created by the Initial Developer are Copyright (C) 1998-1999
+    the Initial Developer. All Rights Reserved.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
 #up {
 	list-style-image: url('chrome://zotero/skin/citation-up.png');
 }
@@ -58,4 +89,142 @@
 #editor {
 	margin-top: 10px;
 	max-height: 100px;
+}
+
+.quick-format-title {
+	margin: 0;
+	font-weight: bold;
+	overflow: hidden;
+}
+
+.quick-format-info {
+	margin: 0;
+	overflow: hidden;
+}
+.quick-format-info > label {
+	margin: 0;
+	padding: 0;
+}
+
+.quick-format-bubble {
+	-moz-border-radius: 8px;
+	background-color: #dee7f8;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #a8c0ec;
+	padding: 0 6px 0 6px;
+	margin: -1px 2px 0 2px;
+	-moz-user-select: all;
+}
+
+.quick-format-bubble:hover {
+	background-color: #bbcef1;
+	border-color: #6d95e0;
+}
+
+.quick-format-bubble:hover {
+	background-color: #bbcef1;
+}
+
+.quick-format-bubble[selected="true"] {
+	-moz-border-radius: 8px !important;
+	background-color: #598bec;
+	color: #fff;
+}
+
+#quick-format-search {
+	margin: 0;
+	padding: 0;
+	background: white;
+	height: 22px;
+	padding-top: 0;
+	padding-bottom: 0;
+	-moz-appearance: searchfield;
+}
+
+#quick-format-search[multiline="true"] {
+	padding: 1px 2px 0 18px;
+	border: 1px solid rgba(0, 0, 0, 0.5);
+	border-radius: 8px;
+	-moz-appearance: none;
+}
+
+body {
+	margin: 0 2px 0 2px;
+	padding: 0;
+	font: -moz-field;
+	font-size: 11px;
+	line-height: 18px;
+	overflow: hidden;
+}
+
+.quick-format-item {
+	font-size: 12px;
+	font: -moz-field;
+	-moz-user-focus: normal;
+	padding: 5px;
+	max-height: 39px;
+}
+
+.quick-format-item:not(:last-child) {
+	border-style: solid;
+	border-width: 0 0 1px 0;
+	border-color: #BBB;
+}
+
+richlistitem[selected="true"] {
+	background: Highlight;
+	color: HighlightText;
+}
+
+#quick-format-entry {
+	background: -moz-linear-gradient(-90deg, rgb(243,123,119) 0, rgb(180,47,38) 50%, rgb(156,36,27) 50%);
+	-moz-border-radius:15px;
+	padding: 10px;
+}
+
+#quick-format-reference-list {
+	margin: 0 15px 0 15px;
+	background: white;
+	opacity: 0.9;
+	-moz-user-focus: ignore;
+}
+
+#citation-properties menulist {
+	-moz-appearance: none; color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,.5);
+	border-radius: 12px;
+	border: 1px solid rgba(0,0,0,.65);
+	background: -moz-linear-gradient(rgba(110,110,110,.9), rgba(70,70,70,.9) 49%, rgba(50,50,50,.9) 51%, rgba(40,40,40,.9));
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), inset 0 0 1px rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+	background-clip: padding-box;
+	background-origin: padding-box;
+	padding: 2px 9px;
+	border-radius: 3px;
+	min-height: 22px;
+	-moz-padding-start: 4px;
+	-moz-padding-end: 0;
+}
+
+#citation-properties menulist:-moz-focusring {
+	box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;
+}
+
+#citation-properties menulist[open="true"],
+#citation-properties menulist:hover:active {
+	background: -moz-linear-gradient(rgba(40,40,40,.9), rgba(70,70,70,.9));
+	box-shadow: inset 0 0 3px rgba(0,0,0,.2), inset 0 1px 7px rgba(0,0,0,.4), 0 1px 0 rgba(255,255,255,.1);
+}
+
+#citation-properties menulist > .menulist-dropmarker {
+	-moz-appearance: none;
+	display: -moz-box;
+	background-color: transparent;
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+#citation-properties menulist > .menulist-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://browser/skin/hud-style-dropmarker-double-arrows.png");
 }
\ No newline at end of file
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 7fb63053c..cfa07f120 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -105,6 +105,7 @@ pref("extensions.zotero.export.quickCopy.compatibility.word", false);
 // Integration settings
 pref("extensions.zotero.integration.port", 50001);
 pref("extensions.zotero.integration.autoRegenerate", -1);	// -1 = ask; 0 = no; 1 = yes
+pref("extensions.zotero.integration.quickFormat", false);
 
 // Connector settings
 pref("extensions.zotero.httpServer.enabled", false);	// TODO enabled for testing only