diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 0c4573e..f8fcf7b 100644
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -736,12 +736,15 @@ class IMAPFolder(BaseFolder):
                         severity = OfflineImapError.ERROR.MESSAGE
                         raise OfflineImapError(message,
                             OfflineImapError.ERROR.MESSAGE)
+                    self.ui.error("%s. While fetching msg %r in folder %r."
+                        " Query: %s Retrying (%d/%d)"% (
+                            e, uids, self.name, query,
+                            retry_num - fails_left, retry_num
+                            )
+                        )
                     # Release dropped connection, and get a new one.
                     self.imapserver.releaseconnection(imapobj, True)
                     imapobj = self.imapserver.acquireconnection()
-                    self.ui.error("%s. While fetching msg %r in folder %r."
-                        " Retrying (%d/%d)"%
-                        (e, uids, self.name, retry_num - fails_left, retry_num))
         finally:
              # The imapobj here might be different than the one created before
              # the ``try`` clause. So please avoid transforming this to a nice
diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py
index 483da54..65433d8 100644
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@@ -477,7 +477,6 @@ class IMAPServer(object):
             # Try to find one that previously belonged to this thread
             # as an optimization.  Start from the back since that's where
             # they're popped on.
-            imapobj = None
             for i in range(len(self.availableconnections) - 1, -1, -1):
                 tryobj = self.availableconnections[i]
                 if self.lastowner[tryobj] == curThread.ident: