diff --git a/.maestro/features/02-read-messages.yaml b/.maestro/features/02-read-messages.yaml
index ffa6cdec..2b3002cb 100644
--- a/.maestro/features/02-read-messages.yaml
+++ b/.maestro/features/02-read-messages.yaml
@@ -53,9 +53,11 @@ tags:
 - takeScreenshot: read-05-attachment-preview
 - assertVisible: "q3-report.pdf"
 - tapOn: "Close"
+# Back on the message (the iPad pane has a quick reply instead of Reply All).
 - extendedWaitUntil:
-    visible: "Reply All"
+    notVisible: "Share"
     timeout: 10000
+- assertVisible: ".*q3-report.pdf.*"
 - runFlow: ../subflows/close-message.yaml
 
 # A thread (Projects/Alpha)
diff --git a/.maestro/features/06-swipe-undo.yaml b/.maestro/features/06-swipe-undo.yaml
index 5b7144b3..b2d147dc 100644
--- a/.maestro/features/06-swipe-undo.yaml
+++ b/.maestro/features/06-swipe-undo.yaml
@@ -9,6 +9,7 @@ tags:
 - scrollUntilVisible:
     element: ".*Grüße aus München.*"
     direction: DOWN
+    centerElement: true
     timeout: 20000
 - swipe:
     from: ".*Grüße aus München.*"
diff --git a/.maestro/features/07-move-delete-tag.yaml b/.maestro/features/07-move-delete-tag.yaml
index ee266e0c..573a0575 100644
--- a/.maestro/features/07-move-delete-tag.yaml
+++ b/.maestro/features/07-move-delete-tag.yaml
@@ -52,7 +52,13 @@ tags:
     visible: ".*Weekly digest.*"
     timeout: 15000
 
-# Select from the list and star, then unstar
+# Select from the list and star, then unstar. On a phone the row can be
+# below the fold (earlier runs left mail on top).
+- scrollUntilVisible:
+    element: ".*Grüße aus München.*"
+    direction: DOWN
+    centerElement: true
+    timeout: 20000
 - longPressOn: ".*Grüße aus München.*"
 - extendedWaitUntil:
     visible: "Clear selection"