diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 262c624..7db8ebc 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,3 +1,10 @@
+offlineimap (4.0.7) unstable; urgency=low
+
+  * Added additional debug logging when downloading messages in an attempt to
+    get the info needed to address #199452.
+
+ -- John Goerzen <jgoerzen@complete.org>  Sun,  1 Aug 2004 16:48:15 -0500
+
 offlineimap (4.0.6) unstable; urgency=low
 
   * Corrected check for Curses.Blinkenlights hotkey press.  Closes: #256336.
diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py
index 1f36ece..97711ef 100644
--- a/offlineimap/head/offlineimap/folder/IMAP.py
+++ b/offlineimap/head/offlineimap/folder/IMAP.py
@@ -1,5 +1,5 @@
 # IMAP folder support
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002-2004 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -107,7 +107,11 @@ class IMAPFolder(BaseFolder):
         imapobj = self.imapserver.acquireconnection()
         try:
             imapobj.select(self.getfullname(), readonly = 1)
-            return imapobj.uid('fetch', '%d' % uid, '(BODY.PEEK[])')[1][0][1].replace("\r\n", "\n")
+            initialresult = imapobj.uid('fetch', '%d' % uid, '(BODY.PEEK[])')
+            ui.debug('imap', 'Returned object from fetching %d: %s' % \
+                     (uid, str(initialresult)))
+            return initialresult[1][0][1].replace("\r\n", "\n")
+                
         finally:
             self.imapserver.releaseconnection(imapobj)