nnimap.el (nnimap-update-info): Fix problem with `g' chopping of low-numbered articles.

message.el (message-resend): Don't disable encoding unless it's already encoded.

3 files changed, 18 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5eb6e138630..8afb226a404 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-resend): Don't disable encoding unless it's
+        already encoded.
+
+        * nnimap.el (nnimap-update-info): Fix problem with `g' chopping of
+        low-numbered articles.
+
 2010-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * rfc2047.el (rfc2047-syntax-table): Simplify.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index be09d0856eb..07ffaf14fcb 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7432,7 +7432,11 @@ is for the internal use."
       (when (looking-at "From ")
         (replace-match "X-From-Line: "))
       ;; Send it.
-      (let ((message-inhibit-body-encoding t)
+      (let ((message-inhibit-body-encoding
+             ;; Don't do any further encoding if it looks like the
+             ;; message has already been encoded.
+             (let ((case-fold-search t))
+               (re-search-forward "^mime-version:" nil t)))
             (message-inhibit-ecomplete t)
             message-required-mail-headers
             message-generate-hashcash
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 67e2c91c3a2..ed69c4cdab2 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1155,13 +1155,16 @@ textual parts.")
                 (not (gnus-active group)))
             (gnus-set-active group
                              (cond
+                              (active
+                               (cons (min (or low (car active))
+                                          (car active))
+                                     (max (or high (cdr active))
+                                          (cdr active))))
                               ((and low high)
                                (cons low high))
                               (uidnext
                                ;; No articles in this group.
                                (cons uidnext (1- uidnext)))
-                              (active
-                               active)
                               (start-article
                                (cons start-article (1- start-article)))
                               (t