diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index 2c9738dab..92c7f09a4 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -96,4 +96,5 @@
       Nav messages with '/' now get split on newlines
 0.70: Handle nav messages from newer Gadgetbridge builds that output distance as a String
       If we receive a 'music' message and we're in the messages app (but not showing a message) show music (#2814)
-0.71: Cancel buzzing when watch unlocked, or when different messages viewed
\ No newline at end of file
+0.71: Cancel buzzing when watch unlocked, or when different messages viewed
+      On 2v18.64+ firmware, 'No Messages' now has a 'back' button
\ No newline at end of file
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index 030781df1..395b56a4d 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -414,8 +414,9 @@ function checkMessages(options) {
     if (!options.clockIfNoMsg) return E.showPrompt(/*LANG*/"No Messages",{
       title:/*LANG*/"Messages",
       img:require("heatshrink").decompress(atob("kkk4UBrkc/4AC/tEqtACQkBqtUDg0VqAIGgoZFDYQIIM1sD1QAD4AIBhnqA4WrmAIBhc6BAWs8AIBhXOBAWz0AIC2YIC5wID1gkB1c6BAYFBEQPqBAYXBEQOqBAnDAIQaEnkAngaEEAPDFgo+IKA5iIOhCGIAFb7RqAIGgtUBA0VqobFgNVA")),
-      buttons : {/*LANG*/"Ok":1}
-    }).then(() => { load() });
+      buttons : {/*LANG*/"Ok":1},
+      back: () => load()
+    }).then(() => load());
     return load();
   }
   // we have >0 messages