diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee5efac9..2f9ff2f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,3 @@
-Unreleased
-==========
-
-* Implement option to get notifications also for messages not just for mentions
-
 0.51.2 / 2015-09-18
 ==================
 
diff --git a/client/index.html b/client/index.html
index 208afead..cbb823ce 100644
--- a/client/index.html
+++ b/client/index.html
@@ -261,7 +261,7 @@ <h2>Notifications</h2>
 
 							<div class="col-sm-12">
 								<label class="opt">
-									<input type="checkbox" name="notifyMessage">
+									<input type="checkbox" name="notifyAllMessages">
 									Enable notification for all messages
 								</label>
 							</div>
diff --git a/client/js/shout.js b/client/js/shout.js
index 3301acd2..a24677b5 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -347,7 +347,7 @@ $(function() {
 		part: true,
 		thumbnails: true,
 		quit: true,
-		notifyMessage: false,
+		notifyAllMessages: false,
 	}, $.cookie("settings"));
 
 	for (var i in options) {
@@ -373,7 +373,7 @@ $(function() {
 			"nick",
 			"part",
 			"quit",
-			"notifyMessage",
+			"notifyAllMessages",
 		].indexOf(name) !== -1) {
 			chat.toggleClass("hide-" + name, !self.prop("checked"));
 		}
@@ -577,7 +577,7 @@ $(function() {
 		var highlight = type.contains("highlight");
 		var message = type.contains("message");
 		var settings = $.cookie("settings") || {};
-		if (highlight || isQuery || (settings.notifyMessage && message)) {
+		if (highlight || isQuery || (settings.notifyAllMessages && message)) {
 			if (!document.hasFocus() || !$(target).hasClass("active")) {
 				if (settings.notification) {
 					pop.play();