diff --git a/controllers/MailController.php b/controllers/MailController.php
index f19abbfc..9962b6ba 100644
--- a/controllers/MailController.php
+++ b/controllers/MailController.php
@@ -517,7 +517,7 @@ private function getNextReadMessage($id): ?Message
             ->leftJoin('user_message', 'user_message.message_id = message.id')
             ->where(['user_id' => Yii::$app->user->id])
             ->andWhere(['!=', 'message_id', $id])
-            ->andWhere(['<=', 'last_viewed', 'updated_at'])
+            ->andWhere('user_message.last_viewed >= message.updated_at')
             ->orderBy([
                 'user_message.pinned' => SORT_DESC,
                 'message.updated_at' => SORT_DESC