diff --git a/coder.py b/coder.py
index 852c4e07b..258eb4f71 100755
--- a/coder.py
+++ b/coder.py
@@ -113,11 +113,11 @@ class Coder:
     def get_files_messages(self):
         files_content = prompts.files_content_prefix
         files_content += self.get_files_content()
-        files_content += prompts.files_content_suffix
 
         files_messages = [
             dict(role="user", content=files_content),
             dict(role="assistant", content="Ok."),
+            dict(role="system", content=prompts.files_content_suffix),
         ]
 
         return files_messages
diff --git a/prompts.py b/prompts.py
index 83c0cc96c..545f2bb2c 100644
--- a/prompts.py
+++ b/prompts.py
@@ -58,10 +58,8 @@ files_content_local_edits = "I made some changes to the files myself."
 
 files_content_prefix = "Here is the current content of the files:\n\n"
 
-files_content_suffix = """
-
-BASE ANY EDITS ON THE CURRENT CONTENTS OF THE FILES AS SHOWN IN THIS MESSAGE.
-NEVER REPLY WITH AN ENTIRE FILE IN THE TRIPLE-QUOTED FORMAT LIKE THIS!
+files_content_suffix = """BASE ANY EDITS ON THE CURRENT CONTENTS OF THE FILES AS SHOWN IN THE USER'S LAST MESSAGE.
+NEVER REPLY WITH AN ENTIRE FILE IN THE TRIPLE-QUOTED FORMAT LIKE THAT!
 ANY CODE YOU INCLUDE IN A REPLY MUST BE IN THE ORIGINAL/UPDATED FORMAT!
 THE ORIGINAL BLOCK MUST BE THE *EXACT* LINES FROM THE FILE!
 INCLUDE ALL THE LEADING SPACES!!