diff --git a/mutt-1.5.21-syncdebug.patch b/mutt-1.5.21-syncdebug.patch
new file mode 100644
index 0000000..016e500
--- /dev/null
+++ b/mutt-1.5.21-syncdebug.patch
@@ -0,0 +1,12 @@
+diff -up mutt-1.5.21/imap/imap.c.syncdebug mutt-1.5.21/imap/imap.c
+--- mutt-1.5.21/imap/imap.c.syncdebug	2012-03-27 10:05:44.978962551 +0200
++++ mutt-1.5.21/imap/imap.c	2012-03-27 10:05:54.223252267 +0200
+@@ -1128,7 +1128,7 @@ static int sync_helper (IMAP_DATA* idata
+ 
+   char buf[LONG_STRING];
+ 
+-  if (!mutt_bit_isset (idata->ctx->rights, right))
++  if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
+     return 0;
+ 
+   if (right == M_ACL_WRITE && !imap_has_flag (idata->flags, name))
diff --git a/mutt.spec b/mutt.spec
index 287e690..942dab4 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.21
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -35,6 +35,7 @@ Patch9: mutt-1.5.21-gpgme-1.2.0.patch
 Patch10: mutt-1.5.21-pophash.patch
 Patch11: mutt-1.5.21-certscomp.patch
 Patch12: mutt-1.5.21-notation.patch
+Patch13: mutt-1.5.21-syncdebug.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +83,7 @@ for selecting groups of messages.
 %patch10 -p1 -b .pophash
 %patch11 -p1 -b .certscomp
 %patch12 -p1 -b .notation
+%patch13 -p1 -b .syncdebug
 
 sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 
@@ -164,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Thu May 10 2012 Honza Horak <hhorak@redhat.com> - 5:1.5.21-12
+- Fix segmentation fault while syncing mailbox
+  (rhbz#691719)
+
 * Wed Apr 25 2012 Honza Horak <hhorak@redhat.com> - 5:1.5.21-11
 - Patch from Petr Pisar fixing verification of PGP signatures 
   with NULL notation