diff --git a/package-info.xml b/package-info.xml
new file mode 100644
index 0000000..8ce896a
--- /dev/null
+++ b/package-info.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE package-info SYSTEM "http://www.elkarte.net/site/package-info">
+<package-info xmlns="http://www.elkarte.net/site/package-info" xmlns:elk="http://www.elkarte.net/">
+	<id>Frenzie:quick_quote</id>
+	<name>Quick Quote</name>
+	<version>0.1</version>
+	<type>addon</type>
+	<install for="1.0 - 1.0.99">
+		<readme parsebbc="true">readme.txt</readme>
+		<license type="inline">This ElkArte addon is released under a BSD license</license>
+		<require-file name="quickQuote.hooks.php" destination="SUBSDIR">Integration hooks</require-file>
+		<require-file name="quickQuote.js" destination="THEMEDIR/scripts">The workhorse</require-file>
+		<require-file name="quickQuote.english.php" destination="LANGUAGEDIR/english">English language strings</require-file>
+		<hook hook="integrate_load_theme" file="SUBSDIR/quickQuote.hooks.php" function="QQ_integrate_load_theme" />
+	</install>
+
+	<uninstall for="1.0 - 1.0.99">
+		<hook reverse="true" hook="integrate_load_theme" file="SUBSDIR/quickQuote.hooks.php" function="QQ_integrate_load_theme" />
+		<remove-file name="SUBSDIR/quickQuote.hooks.php" />
+		<remove-file name="THEMEDIR/scripts/quickQuote.js" />
+		<remove-file name="LANGUAGEDIR/english/quickQuote.english.php" />
+	</uninstall>
+</package-info>
diff --git a/quickQuote.english.php b/quickQuote.english.php
new file mode 100644
index 0000000..1a151e1
--- /dev/null
+++ b/quickQuote.english.php
@@ -0,0 +1,3 @@
+<?php
+
+$txt['quick_quote'] = 'Quick quote';
diff --git a/quickQuote.hooks.php b/quickQuote.hooks.php
new file mode 100644
index 0000000..4d411a5
--- /dev/null
+++ b/quickQuote.hooks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @package Quick quote
+ * @author Frenzie
+ * @license BSD
+ */
+
+if (!defined('ELK'))
+	die('No access...');
+
+function QQ_integrate_load_theme()
+{
+	global $txt, $modSettings;
+
+	addInlineJavascript('		
+		quickQuote.txt = ' . $txt['quick_quote'] . ';', true);
+
+	loadJavascriptFile('quickQuote.js');
+}
diff --git a/quickQuote.js b/quickQuote.js
new file mode 100644
index 0000000..341c0c9
--- /dev/null
+++ b/quickQuote.js
@@ -0,0 +1,365 @@
+// IE-inspired convenience wrappers for document.evaluate
+// Used in quick quote.
+// Thanks to fearphage https://gist.github.com/fearphage/222294
+if ((typeof Node != 'undefined') && !document.selectNodes) {
+  Node.prototype.selectNodes = function(xpath, resolver) {
+    var contextNode = this.ownerDocument || this, result = [], i = 0, node
+        ,nodes = contextNode.evaluate(xpath, contextNode, resolver || null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    while (node = nodes.snapshotItem(i++)) {
+      result.push(node);
+    }
+    return result;
+  };
+  Node.prototype.selectSingleNode = function(xpath, resolver) {
+    return document.evaluate(xpath, this.ownerDocument || this, resolver || null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+  };
+}
+
+// This particular function was based on My Opera Enhancements and is
+// licensed under the BSD license.
+function initializeQuickQuote() {
+	'use strict';
+	
+	
+	/*
+  * setHiddenFlag() - transverses tree under node and set a flag telling whether element is hidden or not
+  */
+  function setHiddenFlag(node){
+    if( !node ) return;
+    if( typeof node.item == 'function' ){
+      for(var k=0,n;n=node[k++];)
+        setHiddenFlag(n);
+    }
+    else if( isHidden(node)!='' ){
+      node.setAttribute('userjsishidden','true');
+    }
+    else{
+      if(node.removeAttribute)node.removeAttribute('userjsishidden');
+      if(node.childNodes)setHiddenFlag(node.childNodes);
+    }
+  };
+  /*
+  * isHidden() - tells if element should be considered as not visible
+  */
+  function isHidden(node){
+    if(node && node.nodeType == Node.ELEMENT_NODE){
+      var compStyles = getComputedStyle(node,'');
+      if( node.nodeName.toLowerCase()=='br' ) return '';
+      if( compStyles.display=='none' ) return 'display:none';
+      if( compStyles.visibility=='hidden' ) return 'visibility:hidden';
+      if( parseFloat(compStyles.opacity)<0.1 ) return 'opacity';
+      if( node.offsetHeight<4 ) return 'offsetHeight';
+      if( node.offsetWidth<4 ) return 'offsetWidth';
+      return '';
+    }
+    return '';
+  }
+  /*
+  * treeToBBCode() - parses the tree into bbcode
+  */
+  function treeToBBCode(node){
+    var bb = [];
+    if( typeof node.item == 'function' ){
+      for(var k=0,n;n=node[k++];)
+        bb.push(treeToBBCode(n));
+      return bb.join('');
+    }
+
+    if( node.getAttribute && node.getAttribute('userjsishidden')=='true' ){
+      return;
+    }
+
+    switch(node.nodeType){
+    case Node.ELEMENT_NODE:
+      var nname = node.nodeName.toLowerCase();
+      var def = treeToBBCode.defaults[nname];
+      if( def ){
+        //generic behavior
+        bb.push(def.before||'');
+        bb.push(treeToBBCode(node.childNodes));
+        bb.push(def.after||'');
+      }
+      else{
+        //special cases
+        switch(nname){
+        case 'a':
+          if( node.href.indexOf("mailto:")==0 ){
+            bb.push('[EMAIL='+node.href.substring(7)+']');
+            bb.push(treeToBBCode(node.childNodes));
+            bb.push('[/EMAIL]');
+          }
+          else if( node.className.indexOf("attach")>=0 ){
+            bb.push('[ATTACH='+node.href+']');
+            bb.push(treeToBBCode(node.childNodes));
+            bb.push('[/ATTACH]');
+          }
+          else{
+            bb.push('[url='+node.href+']');
+            bb.push(treeToBBCode(node.childNodes));
+            bb.push('[/url]');
+          }
+          break;
+        case 'img':
+          var smileyCode = getSmileyCode(node);
+          bb.push( smileyCode ? ' '+smileyCode+' ' : '[img]'+node.src+'[/img]');
+          break;
+        case 'ol':
+          var type = node.className.indexOf("alpha")>=0 ? 'a' : '1';
+        case 'ul':
+          bb.push('[list'+(type?'='+type:'')+']');
+          var lis = node.selectNodes('li');
+          for(var k=0,li;li=lis[k++];)
+            bb.push('\n  [*] '+trim(treeToBBCode(li)));
+          bb.push('[/list]');
+          break;
+        case 'span':
+          //check for css properties
+          var props=[
+            {name:'textDecoration',forceValue:'underline',before:'[u]',after:'[/u]'},
+            {name:'color',before:'[color=@value]',after:'[/color]'},
+            {name:'fontFamily',before:'[font=@value]',after:'[/font]'},
+            {name:'fontSize',before:'[size=@value]',after:'[/size]',values:{
+              'xx-small':1,
+              'x-small':2,
+              'small':3,
+              'medium':4,
+              'large':5,
+              'x-large':6,
+              'xx-large':7
+            }}
+          ];
+          var start='', end='';
+          for(var k=0,p;p=props[k++];){
+            var value = trim(node.style[p.name]||'',' "');
+            if( ( p.forceValue && value==p.forceValue ) || ( !p.forceValue && value ) ){
+              start += p.before.replace('@value',(p.values ? p.values[value]:null) || value);
+              end += p.after;
+            };
+          };
+          //check for class attribute
+          props=[
+            {name:'alignleft',before:'[ALIGN=left]',after:'[/ALIGN]'},
+            {name:'aligncenter',before:'[ALIGN=center]',after:'[/ALIGN]'},
+            {name:'alignright',before:'[ALIGN=right]',after:'[/ALIGN]'},
+            {name:'alignjustify',before:'[ALIGN=justify]',after:'[/ALIGN]'}
+          ];
+          for(var k=0,p;p=props[k++];){
+            if( node.className.indexOf(p.name)>=0 ){
+              start += p.before;
+              end += p.after;
+            };
+          };
+          bb.push(start);
+          bb.push(treeToBBCode(node.childNodes));
+          bb.push(end);
+          break;
+        case 'p':
+          var ns = node.nextElementSibling||node.nextSibling;
+          //detect quote
+          if( node.className.indexOf("cite") >= 0 &&
+            ns &&
+            ns.nodeName.toLowerCase()=='blockquote' &&
+            ns.className.indexOf("bbquote") >= 0 ){
+            //TODO: user quote - this will break when the forums get localized !
+            ns.__userNameQuoted = node.textContent.replace(/.*originally\s+posted\s+by\s+/i,'').replace(/\s*\:$/,'');
+          }
+          else{
+            bb.push(treeToBBCode(node.childNodes));
+          }
+          break;
+        case 'blockquote':
+          if( node.className.indexOf("bbquote") >= 0 ){
+            bb.push('[QUOTE'+(node.__userNameQuoted?'='+node.__userNameQuoted:'')+']');
+            bb.push(treeToBBCode(node.childNodes));
+            bb.push('[/QUOTE]');
+          }
+          else{
+            bb.push(treeToBBCode(node.childNodes));
+          }
+          break;
+        default:
+          bb.push(treeToBBCode(node.childNodes));
+          break;
+        };
+      }
+      break;
+    case Node.DOCUMENT_NODE:// 9
+    case Node.DOCUMENT_FRAGMENT_NODE:// 11
+      bb.push(treeToBBCode(node.childNodes));
+      break;
+    case Node.TEXT_NODE://3
+    case Node.CDATA_SECTION_NODE:// 4
+      var text = node.nodeValue;
+      if (!node.selectSingleNode('ancestor::pre'))
+        text = text.replace(/\n[ \t]+/g,'\n')
+      bb.push(text);
+      break;
+    }
+    return bb.join('');
+  };
+  treeToBBCode.defaults = {
+    strong:{before:'[B]',after:'[/B]'},
+    b:{before:'[B]',after:'[/B]'},
+    i:{before:'[I]',after:'[/I]'},
+    em:{before:'[I]',after:'[/I]'},
+    s:{before:'[S]',after:'[/S]'},
+    sup:{before:'[SUP]',after:'[/SUP]'},
+    sub:{before:'[SUB]',after:'[/SUB]'},
+    pre:{before:'[CODE]',after:'[/CODE]'},
+    br:{before:'\n',after:''}
+  };
+	
+	  /*
+   * trim() - trim string
+   */
+  function trim(str, charToReplace) {
+    //if char is specified, use that one else clear whitespace
+    if( charToReplace ) {
+      return String(str).replace(new RegExp('^['+charToReplace+']+|['+charToReplace+']+$','g'),'');
+    }
+    else{
+      return String(str).replace(/^\s+|\s+$/g, '');
+    }
+  }
+	
+	  /*
+   * getSmileyCode() - returns smiley code
+   */
+  function getSmileyCode(img){
+    if (!img.src.match(/^http:\/\/thedndsanctuary\.eu\/Smileys\/(default|myopera)\/(\w+)\.gif$/))
+      return ''; // Event not spawned by a forum smiley (else match smiley name below)
+     
+		else {
+			// Alternative text corresponds to smiley code.
+			return img.alt;
+		}
+      
+/*
+    var smileyName = RegExp.$1;
+
+    if (buildSmileyTooltip.buildSmileyTooltipMatches[smileyName]) // Smiley is in exception list.
+      return buildSmileyTooltip.buildSmileyTooltipMatches[smileyName];
+    else // Use filename to obtain smiley code.
+      return ':'+smileyName+':';*/
+  }
+	
+	function getParents(el) {
+    var parents = [];
+
+    var p = el.parentNode;
+
+    while (p !== null) {
+        var o = p;
+        parents.push(o);
+        p = o.parentNode;
+    }
+    return parents; // returns an Array []
+	}
+	
+	function getPostAncestor(selectionAncestor) {
+		var parents = getParents(selectionAncestor);
+		for(var i=0; i<parents.length; i++) {
+			parent = parents[i];
+			if (parent.tagName === 'div' && parent.className.indexOf('post') !== -1) {
+				return parent;
+			}
+		}
+	}
+	
+	var quotebuttons = document.querySelectorAll('.quote_button');
+	
+	for (var i=0; i<quotebuttons.length; i++) {
+		var quotebutton = quotebuttons[i];
+		var li = document.createElement('li');
+		li.className = 'listlevel1';
+		var link = document.createElement('a');
+		link.className = 'linklevel1 quote_button';
+		link.href = '';
+		link.textContent = 'Quick Quote';
+		
+		var username = (quotebuttons[i].parentNode.parentNode.parentNode.previousElementSibling.querySelector('.name').textContent).trim();
+		var quote_msg = 'msg=' + quotebutton.href.split('?')[1].split(';')[1].split('=')[1];
+		var time_unix = quotebutton.parentNode.parentNode.parentNode.querySelector('time').getAttribute('data-timestamp');
+		//console.log(time_unix);
+		link.startTag = '[quote'+(username?' author='+username:'')+((quote_msg&&time_unix)?' link='+quote_msg+' date='+time_unix:'')+']';
+		//var startTag = '[QUOTE]';
+		link.endTag = '[/quote]';
+		
+		
+		            //message when there's no text selected
+            var warning = link.appendChild(document.createElement('span'));
+            warning.textContent = 'Please select some text !';
+            warning.style.border='1px solid orange';
+            warning.style.background='gold';
+            warning.style.padding='0.4em';
+            warning.style.position='absolute';
+            warning.style.marginLeft='8.6em';
+            warning.style.display='none';
+            link._warning = warning;
+		
+		
+		link.addEventListener('click',function(e){
+			e.preventDefault();
+			
+			var startTag = e.target.startTag;
+			var endTag = e.target.endTag;
+
+			// isCollapsed is true for an empty selection
+			var selection = (window.getSelection().isCollapsed ? null : window.getSelection().getRangeAt(0));
+			
+			if( selection ){
+				var selectionAncestor = selection.commonAncestorContainer;
+				var postAncestor = selectionAncestor.selectSingleNode('ancestor-or-self::div[contains(@class,"post")]');
+				//var postAncestor = getPostAncestor(selectionAncestor);
+				setHiddenFlag(selectionAncestor);
+
+				if (selectionAncestor.nodeType != 3 && selectionAncestor.nodeType != 4)
+				{
+					var selectionContents = selectionAncestor.cloneNode(false);
+					selectionContents.appendChild(selection.cloneContents());
+				}
+				else
+					var selectionContents = selection.cloneContents();
+
+				if (postAncestor)
+				{
+					// Clone tree upwards. Some BBCode requires more context
+					// than just the current node, like lists.
+					while(selectionAncestor != postAncestor)
+					{
+						selectionAncestor = selectionAncestor.parentNode;
+						var newSelectionContents = selectionAncestor.cloneNode(false);
+						newSelectionContents.appendChild(selectionContents);
+						selectionContents = newSelectionContents;
+					}
+				}
+
+				var selectedText = trim(treeToBBCode(selectionContents));
+
+				//if( selectedText ){
+					//var textarea = rule.getDestination();
+				var textarea = document.querySelector('#postmodify').message;
+				var newText = (textarea.value?textarea.value+'\n':'') +
+					startTag+selectedText+endTag+'\n';
+				textarea.value = newText;
+				newText = textarea.value;//reading again, to get normalized white-space
+				textarea.setSelectionRange(newText.length,newText.length);
+				textarea.blur(); //needed for Webkit/Blink
+				textarea.focus();
+			}
+			else{
+					this._warning.style.display='block';
+					setTimeout(function(warning){
+						warning.style.display = 'none';
+					},1000,this._warning);
+			}
+		},false);
+		
+		
+		li.appendChild(link);
+		console.log(quotebutton.parentNode)
+		quotebutton.parentNode.parentNode.insertBefore(li, quotebutton.parentNode.nextSibling);
+	}
+}
+
+document.addEventListener('DOMContentLoaded', initializeQuickQuote, false);
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..b2627e7
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1,4 @@
+[center][size=16pt][b]Quick Quote[/b][/size][/center]
+[hr]
+
+This addon adds a quick quote button next to the quote button that lets you select a bunch of text to quote.