diff --git a/apps/messages/settings.js b/apps/messages/settings.js
new file mode 100644
index 000000000..ef6266cf6
--- /dev/null
+++ b/apps/messages/settings.js
@@ -0,0 +1,35 @@
+(function(back) {
+  function settings() {
+    let settings = require('Storage').readJSON("messages.settings.json", true) || {};
+    if (settings.vibrate===undefined) settings.vibrate=".";
+    if (settings.repeat===undefined) settings.repeat=4;
+    return settings;
+  }
+  function updateSetting(setting, value) {
+    let settings = require('Storage').readJSON("messages.settings.json", true) || {};
+    settings[setting] = value;
+    require('Storage').writeJSON("messages.settings.json", settings);
+  }
+
+  var vibPatterns = ["Off", ".", "-", "--", "-.-", "---"];
+  var currentVib = settings().vibrate;
+  var mainmenu = {
+    "" : { "title" : "Messages" },
+    "< Back" : back,
+    'Vibrate': {
+      value: Math.max(0,vibPatterns.indexOf(settings().vibrate)),
+      min: 0, max: vibPatterns.length,
+      format: v => vibPatterns[v]||"Off",
+      onchange: v => {
+        updateSetting("vibrate", vibPatterns[v]);
+      }
+    },
+    'Repeat': {
+      value: settings().repeat,
+      min: 2, max: 10,
+      format: v => v+"s",
+      onchange: v => updateSetting("repeat", v)
+    },
+  };
+  E.showMenu(mainmenu);
+})
diff --git a/core b/core
index 996299a28..50aa45f13 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 996299a285c95136ad0049febb5399ee837c42d3
+Subproject commit 50aa45f13f06cc2f40684971d4c0a68d061b1f3c