diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 7914efe6b1..6f6dff5abc 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -131,6 +131,7 @@
 		<li>[Fix] Pagination of User Notes in MCP uses two different config values. (Bug #56025)</li>
 		<li>[Fix] List hidden groups on viewprofile where the viewing user is also a member. (Bug #31845)</li>
 		<li>[Fix] Sort viewprofile group list by group name.</li>
+		<li>[Fix] Do not unsubscribe users from topics replying with quickreply. (Bug #56235)</li>
 		<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
 		<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
 		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a114940449..93c1f99f0e 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1690,7 +1690,7 @@ if ($s_can_vote || $s_quick_reply)
 		$s_attach_sig	= $config['allow_sig'] && $user->optionget('attachsig') && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig');
 		$s_smilies		= $config['allow_smilies'] && $user->optionget('smilies') && $auth->acl_get('f_smilies', $forum_id);
 		$s_bbcode		= $config['allow_bbcode'] && $user->optionget('bbcode') && $auth->acl_get('f_bbcode', $forum_id);
-		$s_notify		= $config['allow_topic_notify'] && $user->data['user_notify'];
+		$s_notify		= $config['allow_topic_notify'] && ($user->data['user_notify'] || $s_watching_topic['is_watching']);
 
 		$qr_hidden_fields = array(
 			'topic_cur_post_id'		=> (int) $topic_data['topic_last_post_id'],