diff --git a/ChangeLog b/ChangeLog
index 0ce63017..c64d9dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* Added 'music_player_interval' config option to specify an update interval for
 	 		music player threads (currently honored by mpd and audacious).
 	* Fixed some minor memory leaks associated with SIGUSR1
+	* Zero out imap and pop3 stuff when the connection fails
 
 2007-08-31
 	* _Really_ fix mpd SIGPIPE issues
diff --git a/src/conky.c b/src/conky.c
index 03b2f238..6b59b896 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -1560,6 +1560,8 @@ next_iteration:
 		if (timed_thread_test (mail->p_timed_thread))
 		    timed_thread_exit (mail->p_timed_thread);
 	}
+	mail->unseen = 0;
+	mail->messages = 0;
 	return 0;
 }
 
@@ -1763,6 +1765,8 @@ next_iteration:
 		if (timed_thread_test (mail->p_timed_thread))
 		    timed_thread_exit (mail->p_timed_thread);
 	}
+	mail->unseen = 0;
+	mail->used = 0;
 	return 0;
 }