diff --git a/apps.json b/apps.json
index e5e9f8f02..e37bfd908 100644
--- a/apps.json
+++ b/apps.json
@@ -77,7 +77,7 @@
   {
     "id": "messages",
     "name": "Messages",
-    "version": "0.14",
+    "version": "0.15",
     "description": "App to display notifications from iOS and Gadgetbridge",
     "icon": "app.png",
     "type": "app",
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 94848a26c..76407cb45 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -21,3 +21,4 @@
       Add 'Delete All' option to message options
       Now update correctly when 'require("messages").clearAll()' is called
 0.14: Hide widget when all unread notifications are dismissed from phone
+0.15: Don't buzz when Quiet Mode is active
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 79009e77e..eb066acb9 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -52,7 +52,7 @@ var MESSAGES = require("Storage").readJSON("messages.json",1)||[];
 if (!Array.isArray(MESSAGES)) MESSAGES=[];
 var onMessagesModified = function(msg) {
   // TODO: if new, show this new one
-  if (msg && msg.new) {
+  if (msg && msg.new && !((require('Storage').readJSON('setting.json', 1) || {}).quiet)) {
     if (WIDGETS["messages"]) WIDGETS["messages"].buzz();
     else Bangle.buzz();
   }
diff --git a/apps/messages/lib.js b/apps/messages/lib.js
index b3cb7d9d4..32dff78ba 100644
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@@ -43,7 +43,8 @@ exports.pushMessage = function(event) {
   // otherwise load messages/show widget
   var loadMessages = Bangle.CLOCK || event.important;
   // first, buzz
-  if (loadMessages && global.WIDGETS && WIDGETS.messages)
+  var quiet = (require('Storage').readJSON('setting.json',1)||{}).quiet;
+  if (!quiet && loadMessages && global.WIDGETS && WIDGETS.messages)
       WIDGETS.messages.buzz();
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
@@ -51,7 +52,7 @@ exports.pushMessage = function(event) {
     exports.messageTimeout = undefined;
     // if we're in a clock or it's important, go straight to messages app
     if (loadMessages) return load("messages.app.js");
-    if (!global.WIDGETS || !WIDGETS.messages) return Bangle.buzz(); // no widgets - just buzz to let someone know
+    if (!quiet && (!global.WIDGETS || !WIDGETS.messages)) return Bangle.buzz(); // no widgets - just buzz to let someone know
     WIDGETS.messages.show();
   }, 500);
 }
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index f01d22ec7..e831e5b68 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -26,6 +26,7 @@ WIDGETS["messages"]={area:"tl",width:0,draw:function() {
   WIDGETS["messages"].width=0;
   Bangle.drawWidgets();
 },buzz:function() {
+  if ((require('Storage').readJSON('setting.json',1)||{}).quiet) return; // never buzz during Quiet Mode
   let v = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate || ".";
   function b() {
     var c = v[0];