diff --git a/NOTES.md b/NOTES.md
index 4d9c63d7fc..256ac57163 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -5,4 +5,5 @@ Deprecation TODO's for post - 0.7x
 - public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit")
 - remove all pre-0.7x compatibility selectors for:
 	.post-content
-	.topic-title
\ No newline at end of file
+	.topic-title
+	.post_reply
\ No newline at end of file
diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index c34e0c4196..b9e70cb34d 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -172,7 +172,7 @@ define('forum/topic/posts', [
 		if (!privileges.move) {
 			postEl.find('.move').remove();
 		}
-		postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply').length);
+		postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply, [component="post/reply"]').length);
 		var isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10);
 		postEl.find('.chat, .flag').toggleClass('hidden', isSelfPost || !app.user.uid);
 	}
diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index 90fe941b81..7831180d5f 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -105,8 +105,8 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func
 
 			translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) {
 				var className = isLocked ? 'fa-lock' : 'fa-reply';
-				threadEl.find('.post_reply').html('<i class="fa ' + className + '"></i> ' + translated);
-				$('.topic-main-buttons .post_reply').attr('disabled', isLocked).html(isLocked ? '<i class="fa fa-lock"></i> ' + translated : translated);
+				threadEl.find('.post_reply, [component="post/reply"]').html('<i class="fa ' + className + '"></i> ' + translated);
+				$('.post_reply, [component="post/reply"]').attr('disabled', isLocked).html(isLocked ? '<i class="fa fa-lock"></i> ' + translated : translated);
 			});
 
 			threadEl.find('.quote, .edit, .delete').toggleClass('hidden', isLocked);