1 files changed, 5 insertions, 1 deletions

diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py
index 5affb42a7..c890b5dd1 100644
--- a/Mailman/Archiver/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -202,7 +202,11 @@ class Archiver:
                     txt = txt + h
                 if msg.body[0] != '\n':
                     txt = txt + "\n"
-                txt = txt + msg.body
+                for line in string.split(msg.body, '\n'):
+                    # Quote unprotected From_ lines appearing in body
+                    if line and line[:5] == 'From ':
+                        line = '>' + line
+                    txt = txt + "%s\n" % line
                 f = StringIO(txt)
                 import HyperArch
                 h = HyperArch.HyperArchive(self)