diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 17fbfa8e3..e98cb2040 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -976,17 +976,7 @@ class Coder:
 
     def format_messages(self):
         chunks = self.format_chat_chunks()
-
-        msgs = (
-            chunks.system
-            + chunks.examples
-            + chunks.done
-            + chunks.files
-            + chunks.cur
-            + chunks.reminder
-        )
-
-        return msgs
+        return chunks.all_messages()
 
     def send_message(self, inp):
         self.aider_edited_files = None