diff --git a/mutt-1.5.21-patches.tar.bz2 b/mutt-1.5.21-patches.tar.bz2
index 7d85c6d..25e39c6 100644
--- a/mutt-1.5.21-patches.tar.bz2
+++ b/mutt-1.5.21-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1e8a39baf3c8fcc312a641200013e00e0eb3ac6c6971c89817f83b0aa8528c5
-size 7350
+oid sha256:220b330eec40f2b15ed82bb87cae09b08c7a71e0282b57416183cf0ead7c7086
+size 7583
diff --git a/mutt-1.5.21.dif b/mutt-1.5.21.dif
index d5ca54e..1648d2e 100644
--- a/mutt-1.5.21.dif
+++ b/mutt-1.5.21.dif
@@ -296,3 +296,15 @@
    { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
    /*
    ** .pp
+--- mx.c
++++ mx.c	2011-07-07 11:24:48.680426606 +0000
+@@ -1591,6 +1591,9 @@ void mx_update_context (CONTEXT *ctx, in
+   {
+     h = ctx->hdrs[msgno];
+ 
++    if (!h)
++      continue;
++
+     if (WithCrypto)
+     {
+       /* NOTE: this _must_ be done before the check for mailcap! */
diff --git a/mutt.changes b/mutt.changes
index 936532d..d0ad4a7 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  7 11:26:18 UTC 2011 - werner@suse.de
+
+- Update patch for Mutt Ticket #3288 and check for empty headers
+  in mx_update_context() (bnx#704359)
+
 -------------------------------------------------------------------
 Mon Jun 20 15:11:39 CEST 2011 - werner@suse.de