(nnimap-request-accept-article): Remove From[^:] lines.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15e0d10..41ae8e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,9 @@
 2000-09-24  Simon Josefsson  <simon@josefsson.org>
 
-       * gnus-group.el (gnus-group-nnimap-edit-acl): Check if server support ACL's.
+       * nnimap.el (nnimap-request-accept-article): Remove From[^:] lines.
+
+       * gnus-group.el (gnus-group-nnimap-edit-acl): Check if server
+       support ACL's.
 
        * nnimap.el (nnimap-acl-get): Check capability.
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index e9fb3d7..41efdc4 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1118,9 +1118,13 @@ function is generally only called when Gnus is shutting down."
                                             nnimap-current-move-article)
                                            group 'dontcreate nil
                                            nnimap-server-buffer))
-                 ;; turn into rfc822 format (\r\n eol's)
                  (with-current-buffer (current-buffer)
                    (goto-char (point-min))
+                   ;; remove any 'From blabla' lines, some IMAP servers
+                   ;; reject the entire message otherwise.
+                   (when (looking-at "^From[^:]")
+                     (kill-region (gnus-point-at-bol) (gnus-point-at-eol)))
+                   ;; turn into rfc822 format (\r\n eol's)
                    (while (search-forward "\n" nil t)
                      (replace-match "\r\n")))
                   ;; this 'or' is for Cyrus server bug