diff --git a/apps/messagesoverlay/ChangeLog b/apps/messagesoverlay/ChangeLog
index 069baa12d..d8d34b44c 100644
--- a/apps/messagesoverlay/ChangeLog
+++ b/apps/messagesoverlay/ChangeLog
@@ -11,3 +11,4 @@
       Some optimization in the rendering code
       Track handler changes done by background code
 0.08: Fix linter warnings
+0.09: Fix scrolling to last line for long text
diff --git a/apps/messagesoverlay/lib.js b/apps/messagesoverlay/lib.js
index ec89f30e1..ee15dc70b 100644
--- a/apps/messagesoverlay/lib.js
+++ b/apps/messagesoverlay/lib.js
@@ -426,7 +426,7 @@ const drawMessage = function(msg) {
   } else
     msg.CanscrollUp = false;
 
-  if (currentLine < msg.lines.length) {
+  if (drawnHeight >= maxTextHeight) {
     msg.CanscrollDown = true;
     drawTriangleDown();
   } else
diff --git a/apps/messagesoverlay/metadata.json b/apps/messagesoverlay/metadata.json
index e520b2a2e..58ea4e6df 100644
--- a/apps/messagesoverlay/metadata.json
+++ b/apps/messagesoverlay/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messagesoverlay",
   "name": "Messages Overlay",
-  "version": "0.08",
+  "version": "0.09",
   "description": "An overlay based implementation of a messages UI (display notifications from iOS and Gadgetbridge/Android)",
   "icon": "app.png",
   "type": "bootloader",