diff --git a/src/controllers/composer.js b/src/controllers/composer.js
index 5d9e3a3260..3a30e3dab0 100644
--- a/src/controllers/composer.js
+++ b/src/controllers/composer.js
@@ -77,7 +77,7 @@ exports.post = async function (req, res) {
 			throw new Error('[[error:invalid-data]]');
 		}
 		if (result.queued) {
-			return res.redirect((nconf.get('relative_path') || '/'));
+			return res.redirect((nconf.get('relative_path') || '/') + '?noScriptMessage=[[success:post-queued]]');
 		}
 		const uid = result.uid ? result.uid : result.topicData.uid;
 		user.updateOnlineUsers(uid);
diff --git a/src/middleware/header.js b/src/middleware/header.js
index deb9cbce61..a5e041bc8e 100644
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -157,6 +157,9 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
 	templateValues.defaultLang = meta.config.defaultLang || 'en-GB';
 	templateValues.userLang = res.locals.config.userLang;
 	templateValues.languageDirection = results.languageDirection;
+	if (req.query.noScriptMessage) {
+		templateValues.noScriptMessage = validator.escape(String(req.query.noScriptMessage));
+	}
 
 	templateValues.template = { name: res.locals.template };
 	templateValues.template[res.locals.template] = true;
diff --git a/src/views/partials/noscript/message.tpl b/src/views/partials/noscript/message.tpl
new file mode 100644
index 0000000000..8a5a1a4471
--- /dev/null
+++ b/src/views/partials/noscript/message.tpl
@@ -0,0 +1,9 @@
+{{{ if noScriptMessage }}}
+<noscript>
+    <div class="alert alert-info">
+        <p>
+            {noScriptMessage}
+        </p>
+    </div>
+</noscript>
+{{{ end }}}
\ No newline at end of file
diff --git a/src/views/partials/noscript/warning.tpl b/src/views/partials/noscript/warning.tpl
new file mode 100644
index 0000000000..3d4cddd205
--- /dev/null
+++ b/src/views/partials/noscript/warning.tpl
@@ -0,0 +1,10 @@
+<noscript>
+    <div class="alert alert-danger">
+        <p>
+            Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you have been placed in <strong>read-only mode</strong>.
+        </p>
+        <p>
+            Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).
+        </p>
+    </div>
+</noscript>
\ No newline at end of file