1 files changed, 9 insertions, 0 deletions

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 866f0b08139..b7b51d35061 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -830,11 +830,20 @@ mbx_write (line, mbf)
      char *line;
      FILE *mbf;
 {
+#ifdef MOVEMAIL_QUOTE_POP_FROM_LINES
   if (IS_FROM_LINE (line))
     {
       if (fputc ('>', mbf) == EOF)
         return (NOTOK);
     }
+#endif
+  if (line[0] == '\037')
+    {
+      if (fputs ("^_", mbf) == EOF)
+        return (NOTOK);
+      line++;
+      len--;
+    }
   if (fputs (line, mbf) == EOF) 
     return (NOTOK);
   if (fputc (0x0a, mbf) == EOF)