diff --git a/apps/locale/locales.js b/apps/locale/locales.js
index 7b3146e15..cd720ba62 100644
--- a/apps/locale/locales.js
+++ b/apps/locale/locales.js
@@ -1,6 +1,7 @@
 /* jshint esversion: 6 */
 const distanceUnits = { // how many meters per X?
   "m": 1,
+  "ft": 0.3048,
   "yd": 0.9144,
   "mi": 1609.34,
   "km": 1000,
@@ -160,7 +161,7 @@ var locales = {
     currency_symbol: "$", currency_first: true,
     int_curr_symbol: "USD",
     speed: "mph",
-    distance: { 0: "m", 1: "mi" },
+    distance: { 0: "ft", 1: "mi" },
     temperature: "°F",
     ampm: { 0: "am", 1: "pm" },
     timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" },
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index 7ce568f82..ccc6acec6 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -84,8 +84,8 @@ function showMapMessage(msg) {
   if (msg.distance!==undefined)
     distance = require("locale").distance(msg.distance);
   if (msg.instr) {
-    if (msg.instr.includes("towards")) {
-      m = msg.instr.split("towards");
+    if (msg.instr.includes("towards") || msg.instr.includes("toward")) {
+      m = msg.instr.split(/towards|toward/);
       target = m[0].trim();
       street = m[1].trim();
     }else