diff --git a/matrix/server.py b/matrix/server.py
index 1ef69c4..f0024c9 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -943,10 +943,12 @@ def room_get_messages(self, room_id):
         if not room_buffer.prev_batch:
             return False
 
+        lines = W.window_get_integer(W.current_window(), "win_chat_height")
+
         uuid, request = self.client.room_messages(
             room_id,
             room_buffer.prev_batch,
-            limit=10)
+            limit=lines)
 
         room_buffer.backlog_pending = True
         self.backlog_queue[uuid] = room_id