diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index a651c1747..502a715e5 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -22,3 +22,4 @@
 0.21: Fix broken 'Messages' button in menu
 0.22: Handle connection events for GPS forwarding from phone
 0.23: Handle 'act' Gadgetbridge messages for realtime activity monitoring
+0.24: Handle new 'nav' event for navigation
\ No newline at end of file
diff --git a/apps/android/boot.js b/apps/android/boot.js
index 81975182d..32f4a9025 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -173,6 +173,15 @@
           gbSend({ t: "act", stp: steps-lastSteps, hrm: lastBPM });
           lastSteps = steps;
         }, event.int*1000);
+      },
+      "nav": function() {
+        event.id="nav";
+        if (event.instr) {
+          event.t="add";
+        } else {
+          event.t="remove";
+        }
+        require("messages").pushMessage(event);
       }
     };
     var h = HANDLERS[event.t];
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index f8ea3521a..f6ad9d00f 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.23",
+  "version": "0.24",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",
diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index f314c72d3..400688240 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -88,3 +88,4 @@
 0.63: Fix messages app loading on clock without fast load
 0.64: Ensure we don't get 'undefined' as the message body
 0.65: Make sure messages are saved if not in the clock app (fix #2460)
+0.66: Updated Navigation handling to work with new Gadgetbridge release
\ No newline at end of file
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index e944aff3c..2f2935842 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -15,7 +15,7 @@
 // a message
 require("messages").pushMessage({"t":"add","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
 // maps
-require("messages").pushMessage({"t":"add","id":1,"src":"Maps","title":"0 yd - High St","body":"Campton - 11:48 ETA","img":"GhqBAAAMAAAHgAAD8AAB/gAA/8AAf/gAP/8AH//gD/98B//Pg/4B8f8Afv+PP//n3/f5//j+f/wfn/4D5/8Aef+AD//AAf/gAD/wAAf4AAD8AAAeAAADAAA="});
+GB({t:"nav",instr:"High St towards Tollgate Rd",distance:966,action:"continue",eta:"08:39"})
 // call
 require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true})
 */
@@ -78,30 +78,34 @@ E.on("kill", saveMessages);
 
 function showMapMessage(msg) {
   active = "map";
-  var m, distance, street, target, eta;
-  m=msg.title.match(/(.*) - (.*)/);
-  if (m) {
-    distance = m[1];
-    street = m[2];
-  } else street=msg.title;
-  m=msg.body.match(/(.*) - (.*)/);
-  if (m) {
-    target = m[1];
-    eta = m[2];
-  } else target=msg.body;
+  var m, distance, street, target, img;
+  if (msg.distance!==undefined)
+    distance = require("locale").distance(msg.distance);
+  if (msg.instr) {
+    if (msg.instr.includes("towards")) {
+      m = msg.instr.split("towards");
+      target = m[0].trim();
+      street = m[1].trim();
+    }else
+      target = msg.instr;
+  }
+  if (msg.action=="continue") img = "EBgBAIABwAPgD/Af+D/8f/773/PPY8cDwAPAA8ADwAPAA8AAAAPAA8ADwAAAA8ADwAPA";
+  else if (msg.action=="left") img = "GhcBAYAAAPAAAHwAAD4AAB8AAA+AAAf//8P///x///+PAAPx4AA8fAAHD4ABwfAAcDwAHAIABwAAAcAAAHAAABwAAAcAAAHAAABwAAAc";
+  else if (msg.action=="right") img = "GhcBAABgAAA8AAAPgAAB8AAAPgAAB8D///j///9///+/AAPPAAHjgAD44AB8OAA+DgAPA4ABAOAAADgAAA4AAAOAAADgAAA4AAAOAAAA";
+  else if (msg.action=="finish") img = "HhsBAcAAAD/AAAH/wAAPB4AAeA4AAcAcAAYIcAA4cMAA48MAA4cMAAYAcAAcAcAAcA4AAOA4AAOBxjwHBzjwHjj/4Dnn/4B3P/4B+Pj4A8fj8Acfj8AI//8AA//+AA/j+AB/j+AB/j/A";
   layout = new Layout({ type:"v", c: [
     {type:"txt", font:fontMedium, label:target, bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2 },
-    {type:"h", bgCol:g.theme.bg2, col: g.theme.fg2,  fillx:1, c: [
+    street?{type:"h", bgCol:g.theme.bg2, col: g.theme.fg2,  fillx:1, c: [
       {type:"txt", font:"6x8", label:"Towards" },
       {type:"txt", font:fontLarge, label:street }
-    ]},
+    ]}:{},
     {type:"h",fillx:1, filly:1, c: [
-      msg.img?{type:"img",src:atob(msg.img), scale:2}:{},
+      img?{type:"img",src:atob(img), scale:2, pad:6}:{},
       {type:"v", fillx:1, c: [
         {type:"txt", font:fontLarge, label:distance||"" }
       ]},
     ]},
-    {type:"txt", font:"6x8:2", label:eta }
+    {type:"txt", font:"6x8:2", label:msg.eta||"" }
   ]});
   g.reset().clearRect(Bangle.appRect);
   layout.render();
@@ -256,7 +260,7 @@ function showMessage(msgid) {
     cancelReloadTimeout(); // don't auto-reload to clock now
     return showMusicMessage(msg);
   }
-  if (msg.src=="Maps") {
+  if (msg.id=="nav") {
     cancelReloadTimeout(); // don't auto-reload to clock now
     return showMapMessage(msg);
   }
diff --git a/apps/messagegui/metadata.json b/apps/messagegui/metadata.json
index 1e22f7304..335dd9178 100644
--- a/apps/messagegui/metadata.json
+++ b/apps/messagegui/metadata.json
@@ -2,7 +2,7 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.65",
+  "version": "0.66",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",