diff --git a/Sources/Actions/Display.php b/Sources/Actions/Display.php
index 066877fd02..a132caddc8 100644
--- a/Sources/Actions/Display.php
+++ b/Sources/Actions/Display.php
@@ -225,7 +225,6 @@ public function prepareDisplayContext(): array|bool
 				'label' => Lang::getTxt('quick_edit', file: 'General'),
 				'class' => 'quick_edit',
 				'id' => 'modify_button_' . $output['id'],
-				'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty(Config::$modSettings['toggle_subject']) . '\')"',
 				'icon' => 'quick_edit_button',
 				'show' => $output['can_modify'],
 			],
diff --git a/Themes/default/Calendar.template.php b/Themes/default/Calendar.template.php
index 411178bdf6..629f29de28 100644
--- a/Themes/default/Calendar.template.php
+++ b/Themes/default/Calendar.template.php
@@ -825,12 +825,12 @@ function template_calendar_top($calendar_data)
 
 	echo '
 			<form action="', Config::$scripturl, '?action=calendar;', Utils::$context['calendar_view'], '" id="', !empty($calendar_data['end_date']) ? 'calendar_range' : 'calendar_navigation', '" method="post" accept-charset="UTF-8">
-				<input type="date" name="start_date" id="start_date" value="', $calendar_data['iso_start_date'], '" tabindex="', Utils::$context['tabindex']++, '" class="date_input start" data-type="date">';
+				<input type="date" name="start_date" id="start_date" value="', $calendar_data['iso_start_date'], '" class="date_input start" data-type="date">';
 
 	if (!empty($calendar_data['end_date']))
 		echo '
 				<span>', Utils::strtolower(Lang::getTxt('to', file: 'General')), '</span>
-				<input type="date" name="end_date" id="end_date" value="', $calendar_data['iso_end_date'], '" tabindex="', Utils::$context['tabindex']++, '" class="date_input end" data-type="date">';
+				<input type="date" name="end_date" id="end_date" value="', $calendar_data['iso_end_date'], '" class="date_input end" data-type="date">';
 
 	echo '
 				<input type="submit" class="button" style="float:none" id="view_button" value="', Lang::getTxt('view', file: 'General'), '">
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index c1f38ee025..21f53ef1ed 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -209,7 +209,7 @@ function template_main()
 	// Show the topic information - icon, subject, etc.
 	echo '
 		<div id="forumposts">
-			<form action="', Config::$scripturl, '?action=quickmod2;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm" onsubmit="return oQuickModify.bInEditMode ? oQuickModify.modifySave(\'' . Utils::$context['session_id'] . '\', \'' . Utils::$context['session_var'] . '\') : false">';
+			<form action="', Config::$scripturl, '?action=quickmod2;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">';
 
 	Utils::$context['ignoredMsgs'] = array();
 	Utils::$context['removableMessageIDs'] = array();
@@ -327,30 +327,16 @@ function template_main()
 	}
 
 	echo '
-				var oQuickModify = new QuickModify({
+				new QuickModify({
 					sScriptUrl: smf_scripturl,
+					sFormName: \'quickModForm\',
 					sClassName: \'quick_edit\',
 					bShowModify: ', Config::$modSettings['show_modify'] ? 'true' : 'false', ',
 					iTopicId: ', Utils::$context['current_topic'], ',
-					sTemplateBodyEdit: ', Utils::escapeJavaScript('
-						<div id="quick_edit_body_container">
-							<div id="error_box" class="error"></div>
-							<textarea class="editor" name="message" rows="12" tabindex="' . Utils::$context['tabindex']++ . '">%body%</textarea><br>
-							<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-							<input type="hidden" name="topic" value="' . Utils::$context['current_topic'] . '">
-							<input type="hidden" name="msg" value="%msg_id%">
-							<div class="righttext quickModifyMargin">
-								<input type="submit" name="post" value="' . Lang::getTxt('save', file: 'General') . '" tabindex="' . Utils::$context['tabindex']++ . '" onclick="return oQuickModify.modifySave(\'' . Utils::$context['session_id'] . '\', \'' . Utils::$context['session_var'] . '\');" accesskey="s" class="button">' . (Utils::$context['show_spellchecking'] ? ' <input type="button" value="' . Lang::getTxt('spell_check', file: 'General') . '" tabindex="' . Utils::$context['tabindex']++ . '" onclick="spellCheck(\'quickModForm\', \'message\');" class="button">' : '') . ' <input type="submit" name="cancel" value="' . Lang::getTxt('modify_cancel', file: 'General') . '" tabindex="' . Utils::$context['tabindex']++ . '" onclick="return oQuickModify.modifyCancel();" class="button">
-							</div>
-						</div>'), ',
-					sTemplateSubjectEdit: ', Utils::escapeJavaScript('<input type="text" name="subject" value="%subject%" size="80" maxlength="80" tabindex="' . Utils::$context['tabindex']++ . '">'), ',
-					sTemplateBodyNormal: ', Utils::escapeJavaScript('%body%'), ',
-					sTemplateSubjectNormal: ', Utils::escapeJavaScript('<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.msg%msg_id%#msg%msg_id%" rel="nofollow">%subject%</a>'), ',
-					sTemplateTopSubject: ', Utils::escapeJavaScript('%subject%'), ',
-					sTemplateReasonEdit: ', Utils::escapeJavaScript(Lang::getTxt('reason_for_edit', file: 'General') . ': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" tabindex="' . Utils::$context['tabindex']++ . '" class="quickModifyMargin">'), ',
-					sTemplateReasonNormal: ', Utils::escapeJavaScript('%modify_text'), ',
-					sErrorBorderStyle: ', Utils::escapeJavaScript('1px solid red'), (Utils::$context['can_reply']) ? ',
-					sFormRemoveAccessKeys: \'postmodify\'' : '', '
+					sSaveButtonText: ', Utils::escapeJavaScript(Lang::getTxt('save', file: 'General')), ',
+					sCancelButtonText: ', Utils::escapeJavaScript(Lang::getTxt('modify_cancel', file: 'General')), ',
+					sEditReasonText: ', Utils::escapeJavaScript(Lang::getTxt('reason_for_edit', file: 'General')) . ',
+					sErrorBorderStyle: ', Utils::escapeJavaScript('1px solid red'), '
 				});
 
 				new JumpTo({
@@ -938,7 +924,7 @@ function template_quickreply()
 								', Lang::getTxt('name', file: 'General'), '
 							</dt>
 							<dd>
-								<input type="text" name="guestname" size="25" value="', Utils::$context['name'], '" tabindex="', Utils::$context['tabindex']++, '" required>
+								<input type="text" name="guestname" size="25" value="', Utils::$context['name'], '" required>
 							</dd>';
 
 		if (empty(Config::$modSettings['guest_post_no_email']))
@@ -948,7 +934,7 @@ function template_quickreply()
 								', Lang::getTxt('email', file: 'General'), '
 							</dt>
 							<dd>
-								<input type="email" name="email" size="25" value="', Utils::$context['email'], '" tabindex="', Utils::$context['tabindex']++, '" required>
+								<input type="email" name="email" size="25" value="', Utils::$context['email'], '" required>
 							</dd>';
 		}
 
diff --git a/Themes/default/GenericControls.template.php b/Themes/default/GenericControls.template.php
index 7c217302e3..da3228a020 100644
--- a/Themes/default/GenericControls.template.php
+++ b/Themes/default/GenericControls.template.php
@@ -35,7 +35,7 @@ function template_control_richedit($editor_id, $smileyContainer = null, $bbcCont
 		$editor_context['sce_options']['toolbar'] = '';
 
 	echo '
-		<textarea class="editor" name="', $editor_id, '" id="', $editor_id, '" cols="600" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onchange="storeCaret(this);" tabindex="', Utils::$context['tabindex']++, '" style="width: ', $editor_context['width'], '; height: ', $editor_context['height'], ';', isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? 'border: 1px solid red;' : '', '"', !empty(Utils::$context['editor']['required']) ? ' required' : '', '>', $editor_context['value'], '</textarea>
+		<textarea class="editor" name="', $editor_id, '" id="', $editor_id, '" cols="600" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onchange="storeCaret(this);" style="width: ', $editor_context['width'], '; height: ', $editor_context['height'], ';', isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? 'border: 1px solid red;' : '', '"', !empty(Utils::$context['editor']['required']) ? ' required' : '', '>', $editor_context['value'], '</textarea>
 		<div id="', $editor_id, '_resizer" class="richedit_resize"></div>
 		<input type="hidden" name="', $editor_id, '_mode" id="', $editor_id, '_mode" value="0">
 		<script>
@@ -90,23 +90,7 @@ function template_control_richedit_buttons($editor_id)
 		</span>
 		<span class="post_button_container">';
 
-	$tempTab = Utils::$context['tabindex'];
-
-	if (!empty(Utils::$context['drafts_save']))
-		$tempTab++;
-	elseif ($editor_context['preview_type'])
-		$tempTab++;
-	elseif (Utils::$context['show_spellchecking'])
-		$tempTab++;
-
-	$tempTab++;
-	Utils::$context['tabindex'] = $tempTab;
-
 	foreach (Utils::$context['richedit_buttons'] as $name => $button) {
-		if ($name == 'spell_check') {
-			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
-		}
-
 		if ($name == 'preview') {
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
 			$button['onclick'] = $editor_context['preview_type'] == Editor::PREVIEW_XML ? '' : 'return submitThisOnce(this);';
@@ -115,12 +99,12 @@ function template_control_richedit_buttons($editor_id)
 
 		if ($button['show']) {
 			echo '
-		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
+		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
 		}
 	}
 
 	echo '
-		<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : Lang::getTxt('post', file: 'General'), '" name="post" tabindex="', --$tempTab, '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+		<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : Lang::getTxt('post', file: 'General'), '" name="post" onclick="return submitThisOnce(this);" accesskey="s" class="button">
 		</span>';
 
 	// Start an instance of the auto saver if it's enabled
@@ -206,7 +190,7 @@ function template_control_verification($verify_id, $display_type = 'all', $reset
 				<div class="smalltext" style="margin: 4px 0 8px 0;">
 					<a href="', $verify_context->image_href, ';sound" id="visual_verification_', $verify_id, '_sound" rel="nofollow">', Lang::getTxt('visual_verification_sound', file: 'General'), '</a> / <a href="#visual_verification_', $verify_id, '_refresh" id="visual_verification_', $verify_id, '_refresh">', Lang::getTxt('visual_verification_request_new', file: 'General'), '</a>', $display_type != 'quick_reply' ? '<br>' : '', '<br>
 					', Lang::getTxt('visual_verification_description', file: 'General'), $display_type != 'quick_reply' ? '<br>' : '', '
-					<input type="text" name="', $verify_id, '_vv[code]" value="" size="30" tabindex="', Utils::$context['tabindex']++, '" autocomplete="off" required>
+					<input type="text" name="', $verify_id, '_vv[code]" value="" size="30" autocomplete="off" required>
 				</div>';
 			}
 
@@ -228,7 +212,7 @@ function template_control_verification($verify_id, $display_type = 'all', $reset
 				echo '
 				<div class="smalltext">
 					', $verify_context->questions[$qIndex]['q'], ':<br>
-					<input type="text" name="', $verify_id, '_vv[q][', $verify_context->questions[$qIndex]['id'], ']" size="30" value="', $verify_context->questions[$qIndex]['a'], '" ', $verify_context->questions[$qIndex]['is_error'] ? 'style="border: 1px red solid;"' : '', ' tabindex="', Utils::$context['tabindex']++, '" required>
+					<input type="text" name="', $verify_id, '_vv[q][', $verify_context->questions[$qIndex]['id'], ']" size="30" value="', $verify_context->questions[$qIndex]['a'], '" ', $verify_context->questions[$qIndex]['is_error'] ? 'style="border: 1px red solid;"' : '', ' required>
 				</div>';
 		}
 
diff --git a/Themes/default/ManageBoards.template.php b/Themes/default/ManageBoards.template.php
index d4e5a8832c..271021f447 100644
--- a/Themes/default/ManageBoards.template.php
+++ b/Themes/default/ManageBoards.template.php
@@ -146,7 +146,7 @@ function template_modify_category()
 						<span class="smalltext">', Lang::getTxt('name_on_display', file: 'ManageBoards'), '</span>
 					</dt>
 					<dd>
-						<input type="text" name="cat_name" value="', Utils::$context['category']['editable_name'], '" size="30" tabindex="', Utils::$context['tabindex']++, '">
+						<input type="text" name="cat_name" value="', Utils::$context['category']['editable_name'], '" size="30">
 					</dd>
 					<dt>
 						<strong>', Lang::getTxt('mboards_description', file: 'ManageBoards'), '</strong><br>
@@ -160,7 +160,7 @@ function template_modify_category()
 						<span class="smalltext">', Lang::getTxt('collapse_desc', file: 'ManageBoards'), '</span>
 					</dt>
 					<dd>
-						<input type="checkbox" name="collapse"', Utils::$context['category']['can_collapse'] ? ' checked' : '', ' tabindex="', Utils::$context['tabindex']++, '">
+						<input type="checkbox" name="collapse"', Utils::$context['category']['can_collapse'] ? ' checked' : '', '>
 					</dd>';
 
 	// Show any category settings added by mods using the 'integrate_edit_category' hook.
@@ -185,10 +185,10 @@ function template_modify_category()
 
 	if (isset(Utils::$context['category']['is_new']))
 		echo '
-				<input type="submit" name="add" value="', Lang::getTxt('mboards_add_cat_button', file: 'ManageBoards'), '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', Utils::$context['tabindex']++, '" class="button">';
+				<input type="submit" name="add" value="', Lang::getTxt('mboards_add_cat_button', file: 'ManageBoards'), '" onclick="return !isEmptyText(this.form.cat_name);" class="button">';
 	else
 		echo '
-				<input type="submit" name="edit" value="', Lang::getTxt('modify', file: 'General'), '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', Utils::$context['tabindex']++, '" class="button">
+				<input type="submit" name="edit" value="', Lang::getTxt('modify', file: 'General'), '" onclick="return !isEmptyText(this.form.cat_name);" class="button">
 				<input type="submit" name="delete" value="', Lang::getTxt('mboards_delete_cat', file: 'ManageBoards'), '" data-confirm="', Lang::getTxt('cat_delete_confirm', file: 'ManageBoards'), '" class="button you_sure">';
 	echo '
 				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
diff --git a/Themes/default/ManageMail.template.php b/Themes/default/ManageMail.template.php
index 9a117317eb..6281bad6f6 100644
--- a/Themes/default/ManageMail.template.php
+++ b/Themes/default/ManageMail.template.php
@@ -67,9 +67,9 @@ function template_mailtest()
 		<div class="windowbg">
 				<dl id="post_header">
 					<dt><span id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</span></dt>
-					<dd><input type="text" name="subject" tabindex="1" size="80" maxlength="80"></dd>
+					<dd><input type="text" name="subject" size="80" maxlength="80"></dd>
 				</dl>
-				<textarea class="editor" name="message" rows="5" cols="200" tabindex="2"></textarea>
+				<textarea class="editor" name="message" rows="5" cols="200"></textarea>
 				<dl id="post_footer">
 					<dd><input type="submit" value="', Lang::getTxt('send_message', file: 'General'), '" class="button"></dd>
 				</dl>
diff --git a/Themes/default/ManageNews.template.php b/Themes/default/ManageNews.template.php
index ef989faddd..90b4c7edd1 100644
--- a/Themes/default/ManageNews.template.php
+++ b/Themes/default/ManageNews.template.php
@@ -216,7 +216,7 @@ function template_email_members_compose()
 						<label', (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : ''), ' for="subject" id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</label>
 					</dt>
 					<dd id="pm_subject">
-						<input type="text" id="subject" name="subject" value="', Utils::$context['subject'], '" tabindex="', Utils::$context['tabindex']++, '" size="80" maxlength="84"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
+						<input type="text" id="subject" name="subject" value="', Utils::$context['subject'], '" size="80" maxlength="84"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
 					</dd>
 				</dl>
 				<div id="bbcBox_message"></div>';
diff --git a/Themes/default/PersonalMessage.template.php b/Themes/default/PersonalMessage.template.php
index 284fd8c7f7..e93c696182 100644
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -1027,7 +1027,7 @@ function template_send()
 	// Autosuggest will be added by the JavaScript later on.
 	echo '
 					<dd id="pm_to" class="clear_right">
-						<input type="text" name="to" id="to_control" value="', Utils::$context['to_value'], '" tabindex="', Utils::$context['tabindex']++, '" size="20">';
+						<input type="text" name="to" id="to_control" value="', Utils::$context['to_value'], '" size="20">';
 
 	// A link to add BCC, only visible with JavaScript enabled.
 	echo '
@@ -1046,7 +1046,7 @@ function template_send()
 						<span', (isset(Utils::$context['post_error']['no_to']) || isset(Utils::$context['post_error']['bad_bcc']) ? ' class="error"' : ''), ' id="caption_bbc">', trim(Lang::getTxt('pm_bcc', ['list' => ''], file: 'PersonalMessage')), '</span>
 					</dt>
 					<dd id="bcc_div2">
-						<input type="text" name="bcc" id="bcc_control" value="', Utils::$context['bcc_value'], '" tabindex="', Utils::$context['tabindex']++, '" size="20">
+						<input type="text" name="bcc" id="bcc_control" value="', Utils::$context['bcc_value'], '" size="20">
 						<div id="bcc_item_list_container"></div>
 					</dd>';
 
@@ -1056,7 +1056,7 @@ function template_send()
 						<span', (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</span>
 					</dt>
 					<dd id="pm_subject">
-						<input type="text" name="subject" value="', Utils::$context['subject'], '" tabindex="', Utils::$context['tabindex']++, '" size="80" maxlength="80"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
+						<input type="text" name="subject" value="', Utils::$context['subject'], '" size="80" maxlength="80"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
 					</dd>
 				</dl>';
 
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
index 4ae16e7a83..0b9ee18dc8 100644
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -45,7 +45,7 @@ function template_main()
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
 	if (Utils::$context['make_poll'])
 		echo '
-			var pollOptionNum = 0, pollTabIndex;
+			var pollOptionNum = 0;
 			var pollOptionId = ', Utils::$context['last_choice_id'], ';
 			function addPollOption()
 			{
@@ -55,7 +55,6 @@ function addPollOption()
 						if (document.forms.postmodify.elements[i].id.substr(0, 8) == \'options-\')
 						{
 							pollOptionNum++;
-							pollTabIndex = document.forms.postmodify.elements[i].tabIndex;
 						}
 				}
 				pollOptionNum++
@@ -167,7 +166,7 @@ function addPollOption()
 							<dl class="settings poll_options">
 								<dt>', Lang::getTxt('poll_question', file: 'General'), '</dt>
 								<dd>
-									<input type="text" name="question" value="', isset(Utils::$context['question']) ? Utils::$context['question'] : '', '" tabindex="', Utils::$context['tabindex']++, '" size="80">
+									<input type="text" name="question" value="', isset(Utils::$context['question']) ? Utils::$context['question'] : '', '" size="80">
 								</dd>';
 
 		// Loop through all the choices and print them out.
@@ -177,7 +176,7 @@ function addPollOption()
 									<label for="options-', $choice['id'], '">', Lang::getTxt('option_number', [$choice['number']], file: 'Post'), '</label>
 								</dt>
 								<dd>
-									<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" tabindex="', Utils::$context['tabindex']++, '" size="80" maxlength="255">
+									<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">
 								</dd>';
 
 		echo '
@@ -976,7 +975,7 @@ function template_post_header()
 				}
 			}
 
-			echo ' tabindex="', Utils::$context['tabindex']++, '">';
+			echo '>';
 		}
 		// textarea
 		elseif ($pf['input']['type'] === 'textarea')
@@ -1003,7 +1002,7 @@ function template_post_header()
 				}
 			}
 
-			echo ' tabindex="', Utils::$context['tabindex']++, '">', !empty($pf['input']['attributes']['value']) ? $pf['input']['attributes']['value'] : '', '</textarea>';
+			echo '>', !empty($pf['input']['attributes']['value']) ? $pf['input']['attributes']['value'] : '', '</textarea>';
 		}
 		// Select menus are more complicated
 		elseif ($pf['input']['type'] === 'select' && is_array($pf['input']['options']))
@@ -1029,7 +1028,7 @@ function template_post_header()
 				}
 			}
 
-			echo ' tabindex="', Utils::$context['tabindex']++, '">';
+			echo '>';
 
 			// The options
 			foreach ($pf['input']['options'] as $optlabel => $option)
@@ -1136,7 +1135,7 @@ function template_post_header()
 						echo ' ', $attribute, '="', $value, '"';
 				}
 
-				echo ' tabindex="', Utils::$context['tabindex']++, '"> ', isset($option['label']) ? $option['label'] : $optlabel, '</label>';
+				echo '> ', isset($option['label']) ? $option['label'] : $optlabel, '</label>';
 			}
 
 			echo '
diff --git a/Themes/default/Register.template.php b/Themes/default/Register.template.php
index ede834d014..aefce30060 100644
--- a/Themes/default/Register.template.php
+++ b/Themes/default/Register.template.php
@@ -117,7 +117,7 @@ function verifyAgree()
 							<strong><label for="smf_autov_username">', Lang::getTxt('username', file: 'General'), '</label></strong>
 						</dt>
 						<dd>
-							<input type="text" name="user" id="smf_autov_username" size="50" tabindex="', Utils::$context['tabindex']++, '" maxlength="25" value="', isset(Utils::$context['username']) ? Utils::$context['username'] : '', '">
+							<input type="text" name="user" id="smf_autov_username" size="50" maxlength="25" value="', isset(Utils::$context['username']) ? Utils::$context['username'] : '', '">
 							<span id="smf_autov_username_div" style="display: none;">
 								<a id="smf_autov_username_link" href="#">
 									<span id="smf_autov_username_img" class="main_icons check"></span>
@@ -126,13 +126,13 @@ function verifyAgree()
 						</dd>
 						<dt><strong><label for="smf_autov_reserve1">', Lang::getTxt('user_email_address', file: 'General'), '</label></strong></dt>
 						<dd>
-							<input type="email" name="email" id="smf_autov_reserve1" size="50" tabindex="', Utils::$context['tabindex']++, '" value="', isset(Utils::$context['email']) ? Utils::$context['email'] : '', '">
+							<input type="email" name="email" id="smf_autov_reserve1" size="50" value="', isset(Utils::$context['email']) ? Utils::$context['email'] : '', '">
 						</dd>
 					</dl>
 					<dl class="register_form" id="password1_group">
 						<dt><strong><label for="smf_autov_pwmain">', Lang::getTxt('choose_pass', file: 'General'), '</label></strong></dt>
 						<dd>
-							<input type="password" name="passwrd1" id="smf_autov_pwmain" size="50" tabindex="', Utils::$context['tabindex']++, '">
+							<input type="password" name="passwrd1" id="smf_autov_pwmain" size="50">
 							<span id="smf_autov_pwmain_div" style="display: none;">
 								<span id="smf_autov_pwmain_img" class="main_icons invalid"></span>
 							</span>
@@ -143,7 +143,7 @@ function verifyAgree()
 							<strong><label for="smf_autov_pwverify">', Lang::getTxt('verify_pass', file: 'General'), '</label></strong>
 						</dt>
 						<dd>
-							<input type="password" name="passwrd2" id="smf_autov_pwverify" size="50" tabindex="', Utils::$context['tabindex']++, '">
+							<input type="password" name="passwrd2" id="smf_autov_pwverify" size="50">
 							<span id="smf_autov_pwverify_div" style="display: none;">
 								<span id="smf_autov_pwverify_img" class="main_icons valid"></span>
 							</span>
@@ -154,7 +154,7 @@ function verifyAgree()
 							<strong><label for="notify_announcements">', Lang::getTxt('notify_announcements', file: 'General'), '</label></strong>
 						</dt>
 						<dd>
-							<input type="checkbox" name="notify_announcements" id="notify_announcements" tabindex="', Utils::$context['tabindex']++, '"', Utils::$context['notify_announcements'] ? ' checked="checked"' : '', '>
+							<input type="checkbox" name="notify_announcements" id="notify_announcements"', Utils::$context['notify_announcements'] ? ' checked="checked"' : '', '>
 						</dd>
 					</dl>';
 
@@ -171,7 +171,7 @@ function verifyAgree()
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
-						<dd>', str_replace('name="', 'tabindex="' . Utils::$context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+						<dd>', $field['input_html'], '</dd>';
 
 		echo '
 					</dl>';
@@ -232,18 +232,18 @@ function verifyAgree()
 				// Maybe it's a text box - very likely!
 				elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'url')))
 					echo '
-							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" tabindex="', Utils::$context['tabindex']++, '" ', $field['input_attr'], '>';
+							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], '>';
 
 				// You "checking" me out? ;)
 				elseif ($field['type'] == 'check')
 					echo '
-							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" tabindex="', Utils::$context['tabindex']++, '" ', $field['input_attr'], '>';
+							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>';
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
 				{
 					echo '
-							<select name="', $key, '" id="', $key, '" tabindex="', Utils::$context['tabindex']++, '">';
+							<select name="', $key, '" id="', $key, '">';
 
 					if (isset($field['options']))
 					{
@@ -315,7 +315,7 @@ function verifyAgree()
 				<input type="submit" name="accept_agreement_coppa" value="', Utils::$context['coppa_agree_below'], '" class="button">';
 	else
 		echo '
-				<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" tabindex="', Utils::$context['tabindex']++, '" class="button" onclick="this.disabled = true;form.submit();">';
+				<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" class="button" onclick="this.disabled = true;form.submit();">';
 
 	echo '
 			</div>
@@ -502,21 +502,21 @@ function template_admin_register()
 							<span class="smalltext">', Lang::getTxt('admin_register_username_desc', file: 'Login'), '</span>
 						</dt>
 						<dd>
-							<input type="text" name="user" id="user_input" tabindex="', Utils::$context['tabindex']++, '" size="50" maxlength="25">
+							<input type="text" name="user" id="user_input" size="50" maxlength="25">
 						</dd>
 						<dt>
 							<strong><label for="email_input">', Lang::getTxt('admin_register_email', file: 'Login'), '</label></strong>
 							<span class="smalltext">', Lang::getTxt('admin_register_email_desc', file: 'Login'), '</span>
 						</dt>
 						<dd>
-							<input type="email" name="email" id="email_input" tabindex="', Utils::$context['tabindex']++, '" size="50">
+							<input type="email" name="email" id="email_input" size="50">
 						</dd>
 						<dt>
 							<strong><label for="password_input">', Lang::getTxt('admin_register_password', file: 'Login'), '</label></strong>
 							<span class="smalltext">', Lang::getTxt('admin_register_password_desc', file: 'Login'), '</span>
 						</dt>
 						<dd>
-							<input type="password" name="password" id="password_input" tabindex="', Utils::$context['tabindex']++, '" size="50" onchange="onCheckChange();">
+							<input type="password" name="password" id="password_input" size="50" onchange="onCheckChange();">
 						</dd>';
 
 	if (!empty(Utils::$context['member_groups']))
@@ -527,7 +527,7 @@ function template_admin_register()
 							<span class="smalltext">', Lang::getTxt('admin_register_group_desc', file: 'Login'), '</span>
 						</dt>
 						<dd>
-							<select name="group" id="group_select" tabindex="', Utils::$context['tabindex']++, '">';
+							<select name="group" id="group_select">';
 
 		foreach (Utils::$context['member_groups'] as $id => $name)
 			echo '
@@ -548,7 +548,7 @@ function template_admin_register()
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>
-							', str_replace('name="', 'tabindex="' . Utils::$context['tabindex']++ . '" name="', $field['input_html']), '
+							', $field['input_html'], '
 						</dd>';
 
 	echo '
@@ -557,17 +557,17 @@ function template_admin_register()
 							<span class="smalltext">', Lang::getTxt('admin_register_email_detail_desc', file: 'Login'), '</span>
 						</dt>
 						<dd>
-							<input type="checkbox" name="emailPassword" id="emailPassword_check" tabindex="', Utils::$context['tabindex']++, '" checked disabled>
+							<input type="checkbox" name="emailPassword" id="emailPassword_check" checked disabled>
 						</dd>
 						<dt>
 							<strong><label for="emailActivate_check">', Lang::getTxt('admin_register_email_activate', file: 'Login'), '</label></strong>
 						</dt>
 						<dd>
-							<input type="checkbox" name="emailActivate" id="emailActivate_check" tabindex="', Utils::$context['tabindex']++, '"', !empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? ' checked' : '', ' onclick="onCheckChange();">
+							<input type="checkbox" name="emailActivate" id="emailActivate_check"', !empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? ' checked' : '', ' onclick="onCheckChange();">
 						</dd>
 					</dl>
 					<div class="flow_auto">
-						<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" tabindex="', Utils::$context['tabindex']++, '" class="button">
+						<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" class="button">
 						<input type="hidden" name="sa" value="register">
 						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 						<input type="hidden" name="', Utils::$context['admin-regc_token_var'], '" value="', Utils::$context['admin-regc_token'], '">
@@ -610,7 +610,7 @@ function template_edit_agreement()
 				<div class="information">
 					<form action="', Config::$scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="UTF-8">
 						<strong>', Lang::getTxt('admin_agreement_select_language', file: 'Admin'), '</strong>
-						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', Utils::$context['tabindex']++, '">';
+						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();">';
 
 		foreach (Utils::$context['editable_agreements'] as $file => $name)
 			echo '
@@ -622,7 +622,7 @@ function template_edit_agreement()
 							<input type="hidden" name="sa" value="agreement">
 							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 							<input type="hidden" name="', Utils::$context['admin-rega_token_var'], '" value="', Utils::$context['admin-rega_token'], '">
-							<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language_change', file: 'Admin'), '" tabindex="', Utils::$context['tabindex']++, '" class="button">
+							<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language_change', file: 'Admin'), '" class="button">
 						</div>
 					</form>
 				</div><!-- .information -->';
@@ -661,7 +661,7 @@ function template_edit_agreement()
 
 	echo '
 					</div>
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" tabindex="', Utils::$context['tabindex']++, '" class="button" onclick="return resetAgreementConfirm()" />
+					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button" onclick="return resetAgreementConfirm()" />
 					<input type="hidden" name="agree_lang" value="', Utils::$context['current_agreement'], '">
 					<input type="hidden" name="sa" value="agreement">
 					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
@@ -699,29 +699,29 @@ function template_edit_reserved_words()
 					<label for="matchword">', Lang::getTxt('admin_match_whole', file: 'Admin'), '</label>
 				</dt>
 				<dd>
-					<input type="checkbox" name="matchword" id="matchword" tabindex="', Utils::$context['tabindex']++, '"', Utils::$context['reserved_word_options']['match_word'] ? ' checked' : '', '>
+					<input type="checkbox" name="matchword" id="matchword"', Utils::$context['reserved_word_options']['match_word'] ? ' checked' : '', '>
 				</dd>
 				<dt>
 					<label for="matchcase">', Lang::getTxt('admin_match_case', file: 'Admin'), '</label>
 				</dt>
 				<dd>
-					<input type="checkbox" name="matchcase" id="matchcase" tabindex="', Utils::$context['tabindex']++, '"', Utils::$context['reserved_word_options']['match_case'] ? ' checked' : '', '>
+					<input type="checkbox" name="matchcase" id="matchcase"', Utils::$context['reserved_word_options']['match_case'] ? ' checked' : '', '>
 				</dd>
 				<dt>
 					<label for="matchuser">', Lang::getTxt('admin_check_user', file: 'Admin'), '</label>
 				</dt>
 				<dd>
-					<input type="checkbox" name="matchuser" id="matchuser" tabindex="', Utils::$context['tabindex']++, '"', Utils::$context['reserved_word_options']['match_user'] ? ' checked' : '', '>
+					<input type="checkbox" name="matchuser" id="matchuser"', Utils::$context['reserved_word_options']['match_user'] ? ' checked' : '', '>
 				</dd>
 				<dt>
 					<label for="matchname">', Lang::getTxt('admin_check_display', file: 'Admin'), '</label>
 				</dt>
 				<dd>
-					<input type="checkbox" name="matchname" id="matchname" tabindex="', Utils::$context['tabindex']++, '"', Utils::$context['reserved_word_options']['match_name'] ? ' checked' : '', '>
+					<input type="checkbox" name="matchname" id="matchname"', Utils::$context['reserved_word_options']['match_name'] ? ' checked' : '', '>
 				</dd>
 			</dl>
 			<div class="flow_auto">
-				<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" name="save_reserved_names" tabindex="', Utils::$context['tabindex']++, '" class="button">
+				<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" name="save_reserved_names" class="button">
 				<input type="hidden" name="sa" value="reservednames">
 				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 				<input type="hidden" name="', Utils::$context['admin-regr_token_var'], '" value="', Utils::$context['admin-regr_token'], '">
@@ -750,7 +750,7 @@ function template_edit_privacy_policy()
 			<div class="information">
 				<form action="', Config::$scripturl, '?action=admin;area=regcenter" id="change_policy" method="post" accept-charset="UTF-8">
 					<strong>', Lang::getTxt('admin_agreement_select_language', file: 'Admin'), '</strong>
-					<select name="policy_lang" onchange="document.getElementById(\'change_policy\').submit();" tabindex="', Utils::$context['tabindex']++, '">';
+					<select name="policy_lang" onchange="document.getElementById(\'change_policy\').submit();">';
 
 		foreach (Utils::$context['editable_policies'] as $lang => $name)
 			echo '
@@ -761,7 +761,7 @@ function template_edit_privacy_policy()
 					<div class="righttext">
 						<input type="hidden" name="sa" value="policy">
 						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language_change', file: 'Admin'), '" tabindex="', Utils::$context['tabindex']++, '" class="button">
+						<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language_change', file: 'Admin'), '" class="button">
 					</div>
 				</form>
 			</div>';
@@ -803,7 +803,7 @@ function template_edit_privacy_policy()
 	echo '
 				</div>
 				<div class="righttext">
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" tabindex="', Utils::$context['tabindex']++, '" class="button" onclick="return resetPolicyConfirm()" />
+					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button" onclick="return resetPolicyConfirm()" />
 					<input type="hidden" name="policy_lang" value="', Utils::$context['current_policy_lang'], '" />
 					<input type="hidden" name="sa" value="policy" />
 					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '" />
diff --git a/Themes/default/scripts/script.js b/Themes/default/scripts/script.js
index 1a373b2862..d704943942 100644
--- a/Themes/default/scripts/script.js
+++ b/Themes/default/scripts/script.js
@@ -551,6 +551,15 @@ function submitThisOnce(oControl)
 
 	return !smf_formSubmitted;
 }
+function reActivateThis(oControl)
+{
+	// oControl might also be a form.
+	var oForm = 'form' in oControl ? oControl.form : oControl;
+
+	var aTextareas = oForm.getElementsByTagName('textarea');
+	for (var i = 0, n = aTextareas.length; i < n; i++)
+		aTextareas[i].readOnly = false;
+}
 
 // Deprecated, as innerHTML is supported everywhere.
 function setInnerHTML(oElement, sToValue)
diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index 4fcc6ffa41..6b2cd75c57 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -618,35 +618,22 @@ function QuickModify(oOptions)
 	this.sCurMessageId = '';
 	this.oCurMessageDiv = null;
 	this.oCurSubjectDiv = null;
-	this.sMessageBuffer = '';
-	this.sSubjectBuffer = '';
-	this.aAccessKeys = new Array();
+
+	for (const el of document.getElementsByClassName(this.opt.sClassName)) {
+		el.hidden = false;
+		el.addEventListener('click', this.modifyMsg.bind(this, el.id.match(/\d+/)));
+	}
+
+	document.forms[this.opt.sFormName].addEventListener('submit', function() {
+		if (this.bInEditMode) {
+			this.modifySave();
+		}
+	}.bind(this));
 }
 
 // Function called when a user presses the edit button.
 QuickModify.prototype.modifyMsg = function (iMessageId)
 {
-	// Add backwards compatibility with old themes.
-	if (typeof(sSessionVar) == 'undefined')
-		sSessionVar = 'sesc';
-
-	// Removes the accesskeys from the quickreply inputs and saves them in an array to use them later
-	if (typeof(this.opt.sFormRemoveAccessKeys) != 'undefined')
-	{
-		if (typeof(document.forms[this.opt.sFormRemoveAccessKeys]))
-		{
-			var aInputs = document.forms[this.opt.sFormRemoveAccessKeys].getElementsByTagName('input');
-			for (var i = 0; i < aInputs.length; i++)
-			{
-				if (aInputs[i].accessKey != '')
-				{
-					this.aAccessKeys[aInputs[i].name] = aInputs[i].accessKey;
-					aInputs[i].accessKey = '';
-				}
-			}
-		}
-	}
-
 	// First cancel if there's another message still being edited.
 	if (this.bInEditMode)
 		this.modifyCancel();
@@ -656,7 +643,7 @@ QuickModify.prototype.modifyMsg = function (iMessageId)
 
 	// Send out the XMLhttp request to get more info
 	ajax_indicator(true);
-	sendXMLDocument.call(this, smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + iMessageId + ';modify;xml;' + smf_session_var + '=' + smf_session_id, '', this.onMessageReceived);
+	getXMLDocument.call(this, smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + iMessageId + ';modify;xml;' + smf_session_var + '=' + smf_session_id, this.onMessageReceived);
 
 	// Jump to the message
 	document.getElementById('msg' + iMessageId).scrollIntoView();
@@ -678,28 +665,68 @@ QuickModify.prototype.onMessageReceived = function (XMLDoc)
 		return this.modifyCancel();
 
 	// Replace the body part.
-	for (var i = 0; i < XMLDoc.getElementsByTagName("message")[0].childNodes.length; i++)
+	for (let i = 0; i < XMLDoc.getElementsByTagName("message")[0].childNodes.length; i++)
 		sBodyText += XMLDoc.getElementsByTagName("message")[0].childNodes[i].nodeValue;
-	this.oCurMessageDiv = document.getElementById(this.sCurMessageId);
-	this.sMessageBuffer = getInnerHTML(this.oCurMessageDiv);
-
-	// We have to force the body to lose its dollar signs thanks to IE.
-	sBodyText = sBodyText.replace(/\$/g, '{&dollarfix;$}');
-
-	// Actually create the content, with a bodge for disappearing dollar signs.
-	setInnerHTML(this.oCurMessageDiv, this.opt.sTemplateBodyEdit.replace(/%msg_id%/g, this.sCurMessageId.substr(4)).replace(/%body%/, sBodyText).replace(/\{&dollarfix;\$\}/g, '$'));
 
-	// Replace the subject part.
-	this.oCurSubjectDiv = document.getElementById('subject_' + this.sCurMessageId.substr(4));
-	this.sSubjectBuffer = getInnerHTML(this.oCurSubjectDiv);
-
-	sSubjectText = XMLDoc.getElementsByTagName('subject')[0].childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}');
-	setInnerHTML(this.oCurSubjectDiv, this.opt.sTemplateSubjectEdit.replace(/%subject%/, sSubjectText).replace(/\{&dollarfix;\$\}/g, '$'));
+	this.oCurMessageDiv = document.getElementById(this.sCurMessageId);
+	this.oCurSubjectDiv = document.getElementById('subject_' + this.sCurMessageId.substring(4));
+	if (this.oCurSubjectDiv !== null)
+		this.oCurSubjectDiv.hidden = true;
+	this.oCurMessageDiv.hidden = true;
+
+	// Actually create the content.
+	const form = document.createElement("form");
+	form.id = "quickModifyForm";
+
+	var messageInput = document.createElement("textarea");
+	messageInput.name = "message";
+	messageInput.cols = "80";
+	messageInput.rows = "10";
+	messageInput.innerHTML = sBodyText;
+	messageInput.addEventListener('keydown', function(e) {
+		if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+			this.modifySave();
+		}
+		if (e.key === "Escape") {
+			this.modifyCancel();
+		}
+	}.bind(this));
 
-	// Field for editing reason.
-	sReasonText = XMLDoc.getElementsByTagName('reason')[0].childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}');
+	var subjectInput = document.createElement("input");
+	subjectInput.name = "subject";
+	subjectInput.maxLength = "80";
+	subjectInput.size = "80";
+	subjectInput.value = XMLDoc.getElementsByTagName('subject')[0].childNodes[0].nodeValue;
+
+	const reasonLabel = document.createElement("label");
+	const reasonInput = document.createElement("input");
+	reasonInput.name = "modify_reason";
+	reasonInput.maxLength = "80";
+	reasonInput.size = "80";
+	reasonInput.value = XMLDoc.getElementsByTagName('reason')[0].childNodes[0].nodeValue;
+
+	const buttonGroup = document.createElement("div");
+	buttonGroup.className = 'buttonlistend';
+
+	const cancelButton = document.createElement("button");
+	cancelButton.className = 'button';
+	cancelButton.textContent = this.opt.sCancelButtonText;
+	cancelButton.addEventListener('click', this.modifyCancel.bind(this));
+
+	const saveButton = document.createElement("button");
+	saveButton.className = 'button active';
+	saveButton.textContent = this.opt.sSaveButtonText;
+	saveButton.addEventListener('click', this.modifySave.bind(this));
+
+	reasonLabel.append(this.opt.sEditReasonText, reasonInput);
+	buttonGroup.append(saveButton, cancelButton);
+	form.append(subjectInput, messageInput, reasonLabel, buttonGroup);
+	this.oCurMessageDiv.after(form);
+	messageInput.focus();
 
-	$(this.oCurMessageDiv).prepend(this.opt.sTemplateReasonEdit.replace(/%modify_reason%/, sReasonText).replace(/\{&dollarfix;\$\}/g, '$'));
+	if (this.opt.funcOnAfterCreate) {
+		this.opt.funcOnAfterCreate.call(this, form);
+	}
 
 	return true;
 }
@@ -707,76 +734,47 @@ QuickModify.prototype.onMessageReceived = function (XMLDoc)
 // Function in case the user presses cancel (or other circumstances cause it).
 QuickModify.prototype.modifyCancel = function ()
 {
-	// Roll back the HTML to its original state.
 	if (this.oCurMessageDiv)
 	{
-		this.oCurMessageDiv.innerHTML = this.sMessageBuffer;
-		this.oCurSubjectDiv.innerHTML = this.sSubjectBuffer;
+		this.oCurMessageDiv.hidden = false;
+		if (this.oCurSubjectDiv !== null)
+			this.oCurSubjectDiv.hidden = false;
+		document.forms.quickModifyForm.remove();
 	}
 
 	// No longer in edit mode, that's right.
 	this.bInEditMode = false;
 
-	// Let's put back the accesskeys to their original place
-	if (typeof(this.opt.sFormRemoveAccessKeys) != 'undefined')
-	{
-		if (typeof(document.forms[this.opt.sFormRemoveAccessKeys]))
-		{
-			var aInputs = document.forms[this.opt.sFormRemoveAccessKeys].getElementsByTagName('input');
-			for (var i = 0; i < aInputs.length; i++)
-			{
-				if (typeof(this.aAccessKeys[aInputs[i].name]) != 'undefined')
-				{
-					aInputs[i].accessKey = this.aAccessKeys[aInputs[i].name];
-				}
-			}
-		}
-	}
-
 	return false;
 }
 
 // The function called after a user wants to save his precious message.
-QuickModify.prototype.modifySave = function (sSessionId, sSessionVar)
+QuickModify.prototype.modifySave = function (e)
 {
+	e && e.preventDefault && e.preventDefault();
+
 	// We cannot save if we weren't in edit mode.
-	if (!this.bInEditMode)
+	if (!this.bInEditMode) {
 		return true;
+	}
 
-	// Add backwards compatibility with old themes.
-	if (typeof(sSessionVar) == 'undefined')
-		sSessionVar = 'sesc';
+	const x = [];
+	submitThisOnce(document.forms.quickModifyForm);
+	const form = document.forms.quickModifyForm;
 
-	// Let's put back the accesskeys to their original place
-	if (typeof(this.opt.sFormRemoveAccessKeys) != 'undefined')
-	{
-		if (typeof(document.forms[this.opt.sFormRemoveAccessKeys]))
-		{
-			var aInputs = document.forms[this.opt.sFormRemoveAccessKeys].getElementsByTagName('input');
-			for (var i = 0; i < aInputs.length; i++)
-			{
-				if (typeof(this.aAccessKeys[aInputs[i].name]) != 'undefined')
-				{
-					aInputs[i].accessKey = this.aAccessKeys[aInputs[i].name];
-				}
-			}
-		}
+	if (form.firstChild.className === 'errorbox') {
+		form.firstChild.remove();
+		form.message.style.border = '';
+		form.subject.style.border = '';
 	}
 
-	var i, x = new Array(),
-		oCaller = this,
-		formData = {
-			subject : document.forms.quickModForm['subject'].value,
-			message : document.forms.quickModForm['message'].value,
-			topic : parseInt(document.forms.quickModForm.elements['topic'].value),
-			msg : parseInt(document.forms.quickModForm.elements['msg'].value),
-			modify_reason : document.forms.quickModForm.elements['modify_reason'].value
-		};
+	for (const el of form.elements) {
+		x.push(el.name + '=' + el.value.php_to8bit().php_urlencode());
+	}
 
 	// Send in the XMLhttp request and let's hope for the best.
 	ajax_indicator(true);
-
-	sendXMLDocument.call(this, smf_prepareScriptUrl(this.opt.sScriptUrl) + "action=jsmodify;topic=" + this.opt.iTopicId + ";" + smf_session_var + "=" + smf_session_id + ";xml", new URLSearchParams(formData).toString(), this.onModifyDone);
+	sendXMLDocument.call(this, smf_prepareScriptUrl(this.opt.sScriptUrl) + "action=jsmodify;topic=" + this.opt.iTopicId + ";msg=" + this.oCurMessageDiv.id.match(/\d+/) + ";" + smf_session_var + "=" + smf_session_id + ";xml", x.join("&"), this.onModifyDone);
 
 	return false;
 }
@@ -790,9 +788,16 @@ QuickModify.prototype.onModifyDone = function (XMLDoc)
 	// If we didn't get a valid document, just cancel.
 	if (!XMLDoc || !XMLDoc.getElementsByTagName('smf')[0])
 	{
+		reActivateThis(document.forms.quickModifyForm);
+		document.forms.quickModifyForm.message.focus();
+
 		// Mozilla will nicely tell us what's wrong.
-		if (XMLDoc.childNodes.length > 0 && XMLDoc.firstChild.nodeName == 'parsererror')
-			setInnerHTML(document.getElementById('error_box'), XMLDoc.firstChild.textContent);
+		if (XMLDoc.childNodes.length > 0 && XMLDoc.firstChild.nodeName == 'parsererror') {
+			const oDiv = document.createElement('div');
+			oDiv.innerHTML = XMLDoc.firstChild.textContent;
+			oDiv.className = 'errorbox';
+			document.forms.quickModifyForm.prepend(oDiv);
+		}
 		else
 			this.modifyCancel();
 
@@ -805,40 +810,51 @@ QuickModify.prototype.onModifyDone = function (XMLDoc)
 
 	if (body)
 	{
+		this.bInEditMode = false;
 		// Show new body.
-		var bodyText = '';
-		for (var i = 0; i < body.childNodes.length; i++)
+		let bodyText = '';
+		for (let i = 0; i < body.childNodes.length; i++)
 			bodyText += body.childNodes[i].nodeValue;
 
-		this.sMessageBuffer = this.opt.sTemplateBodyNormal.replace(/%body%/, bodyText.replace(/\$/g, '{&dollarfix;$}')).replace(/\{&dollarfix;\$\}/g,'$');
-		setInnerHTML(this.oCurMessageDiv, this.sMessageBuffer);
+		this.oCurMessageDiv.innerHTML = bodyText;
+		this.oCurMessageDiv.hidden = false;
+
+		// Show new subject div, update in case it changed.
+		if (this.oCurSubjectDiv !== null) {
+			let oSubject = message.getElementsByTagName('subject')[0],
+				sSubjectText = oSubject.childNodes[0].nodeValue;
 
-		// Show new subject, but only if we want to...
-		var oSubject = message.getElementsByTagName('subject')[0];
-		var sSubjectText = oSubject.childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}');
-		var sTopSubjectText = oSubject.childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}');
-		this.sSubjectBuffer = this.opt.sTemplateSubjectNormal.replace(/%msg_id%/g, this.sCurMessageId.substr(4)).replace(/%subject%/, sSubjectText).replace(/\{&dollarfix;\$\}/g,'$');
-		setInnerHTML(this.oCurSubjectDiv, this.sSubjectBuffer);
+			this.oCurSubjectDiv.innerHTML = sSubjectText;
+			this.oCurSubjectDiv.hidden = false;
+		}
 
-		// If this is the first message, also update the topic subject.
-		if (oSubject.getAttribute('is_first') == '1')
-			setInnerHTML(document.getElementById('top_subject'), this.opt.sTemplateTopSubject.replace(/%subject%/, sTopSubjectText).replace(/\{&dollarfix;\$\}/g, '$'));
+		document.forms.quickModifyForm.remove();
 
 		// Show this message as 'modified on x by y'.
 		if (this.opt.bShowModify)
-			$('#modified_' + this.sCurMessageId.substr(4)).html(message.getElementsByTagName('modified')[0].childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}'));
+		{
+			let modified = document.getElementById('modified_' + this.sCurMessageId.substring(4));
+			modified.innerHTML = message.getElementsByTagName('modified')[0].childNodes[0].nodeValue;
+		}
 
 		// Show a message indicating the edit was successfully done.
-		$('<div/>',{
-			text: message.getElementsByTagName('success')[0].childNodes[0].nodeValue.replace(/\$/g, '{&dollarfix;$}'),
-			class: 'infobox'
-		}).prependTo('#' + this.sCurMessageId).delay(5000).fadeOutAndRemove(400);
+		const oDiv = document.createElement('div');
+		oDiv.textContent = message.getElementsByTagName('success')[0].childNodes[0].nodeValue;
+		oDiv.className = 'infobox';
+		this.oCurMessageDiv.before(oDiv);
+		setTimeout(() => oDiv.remove(), 4000);
 	}
 	else if (error)
 	{
-		setInnerHTML(document.getElementById('error_box'), error.childNodes[0].nodeValue);
-		document.forms.quickModForm.message.style.border = error.getAttribute('in_body') == '1' ? this.opt.sErrorBorderStyle : '';
-		document.forms.quickModForm.subject.style.border = error.getAttribute('in_subject') == '1' ? this.opt.sErrorBorderStyle : '';
+		reActivateThis(document.forms.quickModifyForm);
+		const oDiv = document.createElement('div');
+		oDiv.innerHTML = error.childNodes[0].nodeValue;
+		oDiv.className = 'errorbox';
+		document.forms.quickModifyForm.prepend(oDiv);
+
+		document.forms.quickModifyForm.message.focus();
+		document.forms.quickModifyForm.message.style.border = error.getAttribute('in_body') == '1' ? this.opt.sErrorBorderStyle : '';
+		document.forms.quickModifyForm.subject.style.border = error.getAttribute('in_subject') == '1' ? this.opt.sErrorBorderStyle : '';
 	}
 }