diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 007f03347..75884c9d2 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -153,6 +153,8 @@ class Coder:
         use_git=True,
         voice_language=None,
         aider_ignore_file=None,
+        cur_messages=None,
+        done_messages=None,
     ):
         if not fnames:
             fnames = []
@@ -166,8 +168,16 @@ class Coder:
 
         self.verbose = verbose
         self.abs_fnames = set()
-        self.cur_messages = []
-        self.done_messages = []
+
+        if cur_messages:
+            self.cur_messages = cur_messages
+        else:
+            self.cur_messages = []
+
+        if done_messages:
+            self.done_messages = done_messages
+        else:
+            self.done_messages = []
 
         self.io = io
         self.stream = stream
diff --git a/aider/main.py b/aider/main.py
index fd6195f5b..bc9c0b732 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -401,6 +401,8 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
                 main_model=switch.model,
                 edit_format=None,
                 fnames=coder.get_inchat_relative_files(),
+                done_messages=coder.done_messages,
+                cur_messages=coder.cur_messages,
             )
             coder_kwargs.update(kwargs)