(mbx_delimit_begin, mbx_delimit_end): Write mbox rather than Babyl

format.  (Bug#2196)

2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 92625428b2e..dc74be755fa 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * movemail.c (mbx_delimit_begin, mbx_delimit_end): Write mbox rather
+        than Babyl format.  (Bug#2196)
+
 2009-01-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * emacsclient.c (decode_options): Use a dummy display name under
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index dd3b8291cc0..d452fd15a78 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -923,7 +923,7 @@ int
 mbx_delimit_begin (mbf)
      FILE *mbf;
 {
-  if (fputs ("\f\n0, unseen,,\n", mbf) == EOF)
+  if (fputs ("From movemail\n", mbf) == EOF)
     return (NOTOK);
   return (OK);
 }
@@ -932,7 +932,7 @@ int
 mbx_delimit_end (mbf)
      FILE *mbf;
 {
-  if (putc ('\037', mbf) == EOF)
+  if (putc ('\n', mbf) == EOF)
     return (NOTOK);
   return (OK);
 }