diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index c8e0ccdf..b1f2e14a 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,5 +1,8 @@
 CHANGELOG
 
+2013-07-13 by draculesti
+Ability to quote locked and trashed threads
+
 2013-07-08 by alderaan
 Add "has_results()" function for MySQL class to replace "record_count() === 0" conditional checks
 
diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index 2e7440fd..dcac83e3 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -13,7 +13,7 @@
 /*	AJAX_LIMIT = array(x,y) = 'x' requests every 'y' seconds.
 	e.g. array(5,10) = 5 requests every 10 seconds	*/
 $AJAX_LIMIT = array(5,10);
-$LimitedPages = array('tcomments','user','forum','top10','browse','usersearch','requests','artist','inbox','subscriptions','bookmarks','announcements','notifications','request','better','similar_artists','userhistory','votefavorite','wiki','torrentgroup','news_ajax','user_recents', 'collage');
+$LimitedPages = array('tcomments','user','forum','top10','browse','usersearch','requests','artist','inbox','subscriptions','bookmarks','announcements','notifications','request','better','similar_artists','userhistory','votefavorite','wiki','torrentgroup','news_ajax','user_recents', 'collage', 'raw_bbcode');
 
 // These users aren't rate limited.
 // This array should contain user IDs.
@@ -161,6 +161,9 @@
 	case 'collage':
 		require(SERVER_ROOT . '/sections/ajax/collage.php');
 		break;
+	case 'raw_bbcode':
+		require(SERVER_ROOT . '/sections/ajax/raw_bbcode.php');
+		break;
 	default:
 		// If they're screwing around with the query string
 		json_die("failure");
diff --git a/sections/ajax/raw_bbcode.php b/sections/ajax/raw_bbcode.php
new file mode 100644
index 00000000..7a1030dc
--- /dev/null
+++ b/sections/ajax/raw_bbcode.php
@@ -0,0 +1,31 @@
+<?
+
+include(SERVER_ROOT . "/sections/forums/functions.php");
+
+$PostID = (int) $_POST['postid'];
+
+if (empty($PostID)) {
+	json_die("error", "empty postid");
+}
+
+$DB->query("
+	SELECT
+        t.ForumID, p.Body
+	FROM forums_posts AS p
+	JOIN forums_topics AS t
+	ON p.TopicID = t.ID
+	WHERE p.ID = '$PostID'");
+
+if (!$DB->has_results()) {
+	json_die("error", "no results");
+}
+
+list($ForumID, $Body) = $DB->next_record();
+$Forums = get_forums();
+if (!check_forumperm($ForumID)) {
+	json_die("error", "assholes");
+}
+
+json_die("success", array("body" => nl2br($Body)));
+
+?>
diff --git a/sections/forums/functions.php b/sections/forums/functions.php
index db6dbe3b..3b8e0bbe 100644
--- a/sections/forums/functions.php
+++ b/sections/forums/functions.php
@@ -94,3 +94,48 @@ function get_forum_info($ForumID) {
 	}
 	return $Forum;
 }
+
+function get_forums() {
+	global $DB, $Cache;
+	if (!$Forums = $Cache->get_value('forums_list')) {
+	$DB->query('
+		SELECT
+			f.ID,
+			f.CategoryID,
+			f.Name,
+			f.Description,
+			f.MinClassRead,
+			f.MinClassWrite,
+			f.MinClassCreate,
+			f.NumTopics,
+			f.NumPosts,
+			f.LastPostID,
+			f.LastPostAuthorID,
+			f.LastPostTopicID,
+			f.LastPostTime,
+			COUNT(sr.ThreadID) AS SpecificRules,
+			t.Title,
+			t.IsLocked,
+			t.IsSticky
+		FROM forums AS f
+			JOIN forums_categories AS fc ON fc.ID = f.CategoryID
+			LEFT JOIN forums_topics as t ON t.ID = f.LastPostTopicID
+			LEFT JOIN forums_specific_rules AS sr ON sr.ForumID = f.ID
+		GROUP BY f.ID
+		ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort');
+	$Forums = $DB->to_array('ID', MYSQLI_ASSOC, false);
+	foreach ($Forums as $ForumID => $Forum) {
+		if (count($Forum['SpecificRules'])) {
+			$DB->query("
+				SELECT ThreadID
+				FROM forums_specific_rules
+				WHERE ForumID = $ForumID");
+			$ThreadIDs = $DB->collect('ThreadID');
+			$Forums[$ForumID]['SpecificRules'] = $ThreadIDs;
+		}
+	}
+	unset($ForumID, $Forum);
+	$Cache->cache_value('forums_list', $Forums, 0); //Inf cache.
+	}
+	return $Forums;
+}
diff --git a/sections/forums/index.php b/sections/forums/index.php
index a62c7f66..71260d54 100644
--- a/sections/forums/index.php
+++ b/sections/forums/index.php
@@ -22,47 +22,7 @@
 	$Cache->cache_value('forums_categories', $ForumCats, 0); //Inf cache.
 }
 
-//This variable contains all our lovely forum data
-if (!$Forums = $Cache->get_value('forums_list')) {
-	$DB->query('
-		SELECT
-			f.ID,
-			f.CategoryID,
-			f.Name,
-			f.Description,
-			f.MinClassRead,
-			f.MinClassWrite,
-			f.MinClassCreate,
-			f.NumTopics,
-			f.NumPosts,
-			f.LastPostID,
-			f.LastPostAuthorID,
-			f.LastPostTopicID,
-			f.LastPostTime,
-			COUNT(sr.ThreadID) AS SpecificRules,
-			t.Title,
-			t.IsLocked,
-			t.IsSticky
-		FROM forums AS f
-			JOIN forums_categories AS fc ON fc.ID = f.CategoryID
-			LEFT JOIN forums_topics as t ON t.ID = f.LastPostTopicID
-			LEFT JOIN forums_specific_rules AS sr ON sr.ForumID = f.ID
-		GROUP BY f.ID
-		ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort');
-	$Forums = $DB->to_array('ID', MYSQLI_ASSOC, false);
-	foreach ($Forums as $ForumID => $Forum) {
-		if (count($Forum['SpecificRules'])) {
-			$DB->query("
-				SELECT ThreadID
-				FROM forums_specific_rules
-				WHERE ForumID = $ForumID");
-			$ThreadIDs = $DB->collect('ThreadID');
-			$Forums[$ForumID]['SpecificRules'] = $ThreadIDs;
-		}
-	}
-	unset($ForumID, $Forum);
-	$Cache->cache_value('forums_list', $Forums, 0); //Inf cache.
-}
+$Forums = get_forums();
 
 if (!empty($_POST['action'])) {
 	switch ($_POST['action']) {
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index 219b7b5f..7807731a 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -455,10 +455,8 @@
 			<div style="float: left;"><a class="post_id" href="forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
 				<?=Users::format_username($AuthorID, true, true, true, true, true)?>
 				<?=time_diff($AddedTime,2)?>
-<?	if (!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')) { ?>
-				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>', true);" class="brackets">Quote</a>
-<?	}
-	if ((!$ThreadInfo['IsLocked'] && check_forumperm($ForumID, 'Write') && $AuthorID == $LoggedUser['ID']) || check_perms('site_moderate_forums')) { ?>
+				- <a href="#quickpost" id="quote_<?=$PostID?>" onclick="Quote('<?=$PostID?>','<?=$Username?>', true);" class="brackets">Quote</a>
+<?	if ((!$ThreadInfo['IsLocked'] && check_forumperm($ForumID, 'Write') && $AuthorID == $LoggedUser['ID']) || check_perms('site_moderate_forums')) { ?>
 				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');" class="brackets">Edit</a>
 <?	}
 	if (check_perms('site_admin_forums') && $ThreadInfo['Posts'] > 1) { ?>
diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php
index 714b1332..fc2e73f1 100644
--- a/sections/requests/new_edit.php
+++ b/sections/requests/new_edit.php
@@ -169,7 +169,7 @@
 			foreach ($ArtistForm as $Importance => $ArtistNames) {
 				foreach ($ArtistNames as $Artist) {
 ?>
-						<input type="text" id="artist" name="artists[]" size="45" value="<?=display_str($Artist['name']) ?>" />
+						<input type="text" id="artist" name="artists[]" <? Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" />
 						<select id="importance" name="importance[]" >
 							<option value="1"<?=($Importance === '1' ? ' selected="selected"' : '')?>>Main</option>
 							<option value="2"<?=($Importance === '2' ? ' selected="selected"' : '')?>>Guest</option>
@@ -184,7 +184,7 @@
 <?				}
 			}
 		} else {
-?>						<input type="text" id="artist" name="artists[]" size="45" onblur="CheckVA();" />
+?>						<input type="text" id="artist" name="artists[]" <? Users::has_autocomplete_enabled('other'); ?>size="45" onblur="CheckVA();" />
 						<select id="importance" name="importance[]" >
 							<option value="1">Main</option>
 							<option value="2">Guest</option>
diff --git a/static/functions/autocomplete.js b/static/functions/autocomplete.js
index d19affcc..017e72cb 100644
--- a/static/functions/autocomplete.js
+++ b/static/functions/autocomplete.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
 		},
 	});
 
-	if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist') {
+	if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist' || (url.path == 'requests' && url.query['action'] == 'new')) {
 		$("#artist" + SELECTOR).autocomplete({
 			serviceUrl : ARTIST_AUTOCOMPLETE_URL
 		});
diff --git a/static/functions/comments.js b/static/functions/comments.js
index bf4b2765..f3b2e2f1 100644
--- a/static/functions/comments.js
+++ b/static/functions/comments.js
@@ -19,19 +19,42 @@ function Quote(post, user) {
 	Quote(post, user, false)
 }
 
+var original_post;
 function Quote(post, user, link) {
 	username = user;
 	postid = post;
-	ajax.get("?action=get_post&post=" + postid, function(response) {
-		if ($('#quickpost').raw().value !== '') {
-			$('#quickpost').raw().value = $('#quickpost').raw().value + "\n\n";
+	if(!$('#reply_box').length) {
+		if ($("#quote_" + postid).text() == "Quote") {
+			original_post = $("#content" + postid).html();
+			$("#quote_" + postid).text("Unquote");
+			$.ajax({
+				type : "POST",
+				url: "ajax.php?action=raw_bbcode",
+				dataType: "json",
+				data : {
+					"postid" : postid
+				}
+			}).done(function(response) {
+				$("#content" + postid).html(response['response']['body']);
+				select_all($("#content" + postid).get(0));
+			});
+		} else {
+			document.getSelection().removeAllRanges();
+			$("#content" + postid).html(original_post);
+			$("#quote_" + postid).text("Quote");
 		}
-		$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote=" + username + (link == true ? "|" + post : "") + "]" +
-			//response.replace(/(img|aud)(\]|=)/ig,'url$2').replace(/\[url\=(https?:\/\/[^\s\[\]<>"\'()]+?)\]\[url\](.+?)\[\/url\]\[\/url\]/gi, "[url]$1[/url]")
-			html_entity_decode(response)
-		+ "[/quote]";
-		resize('quickpost');
-	});
+	} else {
+		ajax.get("?action=get_post&post=" + postid, function(response) {
+			if ($('#quickpost').raw().value !== '') {
+				$('#quickpost').raw().value = $('#quickpost').raw().value + "\n\n";
+			}
+			$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote=" + username + (link == true ? "|" + post : "") + "]" +
+				//response.replace(/(img|aud)(\]|=)/ig,'url$2').replace(/\[url\=(https?:\/\/[^\s\[\]<>"\'()]+?)\]\[url\](.+?)\[\/url\]\[\/url\]/gi, "[url]$1[/url]")
+				html_entity_decode(response)
+			+ "[/quote]";
+			resize('quickpost');
+		});
+	}
 }
 
 function Edit_Form(post,key) {
diff --git a/static/functions/global.js b/static/functions/global.js
index 09fe4360..a691f286 100644
--- a/static/functions/global.js
+++ b/static/functions/global.js
@@ -126,3 +126,19 @@ function remove_selection(index) {
 function Stats(stat) {
 	ajax.get("ajax.php?action=stats&stat=" + stat);
 }
+
+// Thank you http://stackoverflow.com/questions/4578398/selecting-all-text-within-a-div-on-a-single-left-click-with-javascript
+function select_all(el) {
+    if (typeof window.getSelection != "undefined" && typeof document.createRange != "undefined") {
+        var range = document.createRange();
+        range.selectNodeContents(el);
+        var sel = window.getSelection();
+        sel.removeAllRanges();
+        sel.addRange(range);
+    } else if (typeof document.selection != "undefined" && typeof document.body.createTextRange != "undefined") {
+        var textRange = document.body.createTextRange();
+        textRange.moveToElementText(el);
+        textRange.select();
+    }
+}
+
diff --git a/static/functions/requests.js b/static/functions/requests.js
index 57a48cd8..b53680ff 100644
--- a/static/functions/requests.js
+++ b/static/functions/requests.js
@@ -106,6 +106,15 @@ function AddArtistField() {
 		x.appendChild(ArtistField);
 		x.appendChild(document.createTextNode('\n'));
 		x.appendChild(ImportanceField);
+
+		if ($("#artist").data("gazelle-autocomplete")) {
+			$(ArtistField).live('focus', function() {
+				$(ArtistField).autocomplete({
+					serviceUrl : 'artist.php?action=autocomplete'
+				});
+			});
+		}
+
 		ArtistCount++;
 }