diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 7f7f8d3d3..ed38fa79a 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -63,3 +63,4 @@
 0.47: Add new Icons (Nextbike, Mattermost, etc.)
 0.48: When getting new message from the clock, only buzz once the messages app is loaded
 0.49: Change messages icon (to fit within 24px) and ensure widget renders icons centrally
+0.50: Option to disable auto-open of messages
diff --git a/apps/messages/lib.js b/apps/messages/lib.js
index b51180d81..05d525f3b 100644
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@@ -62,12 +62,10 @@ exports.pushMessage = function(event) {
   var quiet       = (require('Storage').readJSON('setting.json',1)||{}).quiet;
   var appSettings = require('Storage').readJSON('messages.settings.json',1)||{};
   var unlockWatch = appSettings.unlockWatch;
-  var quietNoAutOpn = appSettings.quietNoAutOpn;
-  delete appSettings;
   // don't auto-open messages in quiet mode if quietNoAutOpn is true
-  if(quiet && quietNoAutOpn) {
-      loadMessages = false;
-  }
+  if((quiet && appSettings.quietNoAutOpn) || appSettings.noAutOpn)
+    loadMessages = false;
+  delete appSettings;
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
   exports.messageTimeout = setTimeout(function() {
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 408901bfc..da2e0945a 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.49",
+  "version": "0.50",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messages/settings.js b/apps/messages/settings.js
index ac91464f7..7d90f6aea 100644
--- a/apps/messages/settings.js
+++ b/apps/messages/settings.js
@@ -64,6 +64,10 @@
       value: !!settings().quietNoAutOpn,
       onchange: v => updateSetting("quietNoAutOpn", v)
     },
+    /*LANG*/'Disable auto-open': {
+      value: !!settings().noAutOpn,
+      onchange: v => updateSetting("noAutOpn", v)
+    },
     /*LANG*/'Widget messages': {
       value:0|settings().maxMessages,
       min: 1, max: 5,