diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index 3e18b9885..3f5ff70fd 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -81,3 +81,4 @@
 0.57: Fix "unread Timeout" = off (previously defaulted to 60s)
 0.58: Fast load messages without writing to flash
       Don't write messages to flash until the app closes
+0.59: Ensure we do write messages if messages app can't be fast loaded (see #2373)
diff --git a/apps/messagegui/lib.js b/apps/messagegui/lib.js
index 4e1e7e11d..f9919c01c 100644
--- a/apps/messagegui/lib.js
+++ b/apps/messagegui/lib.js
@@ -18,8 +18,11 @@ exports.listener = function(type, msg) {
     if (Bangle.CLOCK && msg.state && msg.title && appSettings.openMusic) loadMessages = true;
     else return;
   }
-  if (Bangle.load === load) {
+  if (Bangle.load === load || !Bangle.uiRemove) {
     // no fast loading: store message to flash
+    /* FIXME: Maybe we need a better way of deciding if an app will
+    be fast loaded than just hard-coding a Bangle.uiRemove check.
+    Bangle.load could return a bool (as the load doesn't happen immediately). */
     require("messages").save(msg);
   } else {
     if (!Bangle.MESSAGES) Bangle.MESSAGES = [];
diff --git a/apps/messagegui/metadata.json b/apps/messagegui/metadata.json
index ad7a87675..3ed22d356 100644
--- a/apps/messagegui/metadata.json
+++ b/apps/messagegui/metadata.json
@@ -1,7 +1,8 @@
 {
   "id": "messagegui",
   "name": "Message UI",
-  "version": "0.58",
+  "sortName": "Messages",
+  "version": "0.59",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",