2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 92e3d8ff5c5..beb47120241 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * nnimap.el (nnimap-open-connection-1): `auth-source-search' for the
+        `nnoo-current-server' first, then for the actual `nnimap-address' to
+        allow netrc entries for the nnoo server to coexist with netrc entries
+        for the `nnimap-address'.
+
 2013-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-decode.el (mm-dissect-buffer): Revert last change.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f8c2b24cc9f..2220c81e775 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -456,8 +456,8 @@ textual parts.")
                                (nnimap-credentials
                                 (gnus-delete-duplicates
                                  (list
-                                  nnimap-address
-                                  (nnoo-current-server 'nnimap)))
+                                  (nnoo-current-server 'nnimap)
+                                  nnimap-address))
                                 ports
                                 nnimap-user))))
                   (setq nnimap-object nil)