diff --git a/client/index.html b/client/index.html
index b774a2a3..cbb823ce 100644
--- a/client/index.html
+++ b/client/index.html
@@ -258,6 +258,13 @@
 									<button id="play">Play sound</button>
 								</div>
 							</div>
+
+							<div class="col-sm-12">
+								<label class="opt">
+									<input type="checkbox" name="notifyAllMessages">
+									Enable notification for all messages
+								</label>
+							</div>
 							<div class="col-sm-12">
 								<h2>About Shout</h2>
 							</div>
diff --git a/client/js/shout.js b/client/js/shout.js
index dc0a8d7f..46a15ef4 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -373,6 +373,7 @@ $(function() {
 		part: true,
 		thumbnails: true,
 		quit: true,
+		notifyAllMessages: false,
 	}, $.cookie("settings"));
 
 	for (var i in options) {
@@ -398,6 +399,7 @@ $(function() {
 			"nick",
 			"part",
 			"quit",
+			"notifyAllMessages",
 		].indexOf(name) !== -1) {
 			chat.toggleClass("hide-" + name, !self.prop("checked"));
 		}
@@ -599,9 +601,10 @@ $(function() {
 		var isQuery = button.hasClass("query");
 		var type = msg.type;
 		var highlight = type.contains("highlight");
-		if (highlight || isQuery) {
+		var message = type.contains("message");
+		var settings = $.cookie("settings") || {};
+		if (highlight || isQuery || (settings.notifyAllMessages && message)) {
 			if (!document.hasFocus() || !$(target).hasClass("active")) {
-				var settings = $.cookie("settings") || {};
 				if (settings.notification) {
 					pop.play();
 				}