diff --git a/archivemail.1 b/archivemail.1
index 934a258..f7161c3 100644
--- a/archivemail.1
+++ b/archivemail.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "ARCHIVEMAIL" "1" "15 October 2006" "SP" ""
+.TH "ARCHIVEMAIL" "1" "19 October 2006" "SP" ""
.SH NAME
archivemail \- archive and compress your old email
@@ -178,10 +178,11 @@ been read by looking at the filename. If the filename contains an 'S' after
\fI:2,\fR then it assumes the message has been read.
.TP
\fB --dont-mangle-from\fR
-Do not mangle lines in message bodies beginning with "From ". Since mail user
-agents may interpret such lines as message separators, by default
-\fBarchivemail\fR mangles them by prepending a '>' to these lines (that is,
-the resulting mailbox is in \fBMBOXO\fR-format). See \fBmbox\fR(5) for more
+Do not mangle lines in message bodies beginning with "From ". When archiving
+a message from a mailbox not in \fBmbox\fR format, by default
+\fBarchivemail\fR mangles such lines by prepending a '>' to them, since mail
+user agents might otherwise interpret these lines as message separators.
+Messages from \fBmbox\fR folders are never mangled. See \fBmbox\fR(5) for more
information.
.TP
\fB --delete\fR
diff --git a/archivemail.sgml b/archivemail.sgml
index dd9e607..9ef95b7 100644
--- a/archivemail.sgml
+++ b/archivemail.sgml
@@ -251,10 +251,11 @@ been read by looking at the filename. If the filename contains an 'S' after
-Do not mangle lines in message bodies beginning with "From ". Since mail user
-agents may interpret such lines as message separators, by default
-' to these lines (that is,
-the resulting mailbox is in ' to them, since mail
+user agents might otherwise interpret these lines as message separators.
+Messages from