diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 16aa47692..10a042618 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -41,8 +41,6 @@
 (declare-function message-narrow-to-head-1 "message" nil)
 ;; The following line suppresses a compiler warning stemming from gnus-sum.el
 (declare-function gnus-summary-last-subject "gnus-sum" nil)
-;; Suppress compiler warning
-(declare-function nnimap-retrieve-headers-from-file "nnimap" nil)
 ;; Customization variables
 
 (when (fboundp 'defvaralias)
@@ -56,17 +54,6 @@ negates this setting for the duration of the command."
   :group 'org-link-store
   :type 'boolean)
 
-(defcustom org-gnus-nnimap-query-article-no-from-file nil
-  "If non-nil, `org-gnus-follow-link' will try to translate
-Message-Ids to article numbers by querying the .overview file.
-Normally, this translation is done by querying the IMAP server,
-which is usually very fast.  Unfortunately, some (maybe badly
-configured) IMAP servers don't support this operation quickly.
-So if following a link to a Gnus article takes ages, try setting
-this variable to `t'."
-  :group 'org-link-store
-  :type 'boolean)
-
 ;; Install the link type
 (org-add-link-type "gnus" 'org-gnus-open)
 (add-hook 'org-store-link-functions 'org-gnus-store-link)
@@ -184,11 +171,7 @@ If `org-store-link' was called with a prefix arg the meaning of
   (cond ((and group article)
 	 (gnus-activate-group group t)
 	 (condition-case nil
-	     (let* ((method (gnus-find-method-for-group group))
-		    (backend (car method))
-		    (server (cadr method)))
-	       (message "method = %s\ngroup = %s\nbackend = %s\nserver = %s"
-			method group backend server)
+	     (let ((backend (car (gnus-find-method-for-group group))))
 	       (cond
 		((eq backend 'nndoc)
 		 (if (gnus-group-read-group t nil group)
@@ -198,12 +181,6 @@ If `org-store-link' was called with a prefix arg the meaning of
 		(t
 		 (let ((articles 1)
 		       group-opened)
-		   ;; work arround IMAP servers that perform badly in
-		   ;; SEARCH commands.
-		   (when (and (eq backend 'nnimap)
-			      org-gnus-nnimap-query-article-no-from-file)
-		     (let ((headers (nnimap-retrieve-headers-from-file group server)))
-		       (message "headers = %s" headers)))
 		   (while (and (not group-opened)
 			       ;; stop on integer overflows
 			       (> articles 0))