diff --git a/mutt-1.5.21-hdrcnt.patch b/mutt-1.5.21-hdrcnt.patch
index 48f4786..c96b817 100644
--- a/mutt-1.5.21-hdrcnt.patch
+++ b/mutt-1.5.21-hdrcnt.patch
@@ -1,12 +1,12 @@
 diff -up mutt-1.5.21/imap/message.c.hdrcnt mutt-1.5.21/imap/message.c
 --- mutt-1.5.21/imap/message.c.hdrcnt	2010-08-24 18:34:21.000000000 +0200
-+++ mutt-1.5.21/imap/message.c	2011-03-28 14:26:41.059338455 +0200
++++ mutt-1.5.21/imap/message.c	2011-04-01 15:23:14.254360560 +0200
 @@ -65,7 +65,7 @@ int imap_read_headers (IMAP_DATA* idata,
    char *hdrreq = NULL;
    FILE *fp;
    char tempfile[_POSIX_PATH_MAX];
 -  int msgno, idx;
-+  int msgno, idx = -1;
++  int msgno, idx = msgbegin - 1;
    IMAP_HEADER h;
    IMAP_STATUS* status;
    int rc, mfhrc, oldmsgcount;