diff --git a/js/quick-reply.js b/js/quick-reply.js
index 34d1a946..d0f38e89 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -216,13 +216,16 @@
 					if ($td.find('input[name="file_url"]').length) {
 						$file_url = $td.find('input[name="file_url"]');
 						
-						// Make a new row for it
-						var $newRow = $('<tr><td colspan="2"></td></tr>');
+						if (settings.get('show_remote', false)) {
+							// Make a new row for it
+							var $newRow = $('<tr><td colspan="2"></td></tr>');
 						
-						$file_url.clone().attr('placeholder', _('Upload URL')).appendTo($newRow.find('td'));
+							$file_url.clone().attr('placeholder', _('Upload URL')).appendTo($newRow.find('td'));
+						
+							$newRow.insertBefore(this);
+						}
 						$file_url.parent().remove();
-						
-						$newRow.insertBefore(this);
+
 						
 						$td.find('label').remove();
 						$td.contents().filter(function() {
@@ -236,6 +239,11 @@
 					}
 				}
 
+				// Disable embedding if configured so
+				if (!settings.get('show_embed', false) && $td.find('input[name="embed"]').length) {
+					$(this).remove();
+				}
+
 				// Remove oekaki if existent
 				if ($(this).is('#oekaki')) {
 					$(this).remove();
diff --git a/js/settings.js b/js/settings.js
index e98b35ae..be6c846d 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -30,7 +30,11 @@ tb_settings['quick-reply'] = {
 	// Hide form when scrolled to top of page (where original form is visible)
 	hide_at_top: true,
 	// "Quick reply" button floating at the top right hand corner of the page at all times
-	floating_link: true
+	floating_link: true,
+	// Show remote in quick reply
+	show_remote: false,
+	// Show embedding in quick reply
+	show_embed: false
 };
 
 // ajax.js