diff --git a/mutt-1.5.21-patches.tar.bz2 b/mutt-1.5.21-patches.tar.bz2
new file mode 100644
index 0000000..7d85c6d
--- /dev/null
+++ b/mutt-1.5.21-patches.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1e8a39baf3c8fcc312a641200013e00e0eb3ac6c6971c89817f83b0aa8528c5
+size 7350
diff --git a/mutt-1.5.21.sidebar-fix.dif b/mutt-1.5.21.sidebar-fix.dif
index f70b0b3..bd8bbc3 100644
--- a/mutt-1.5.21.sidebar-fix.dif
+++ b/mutt-1.5.21.sidebar-fix.dif
@@ -64,7 +64,7 @@
  	  BuffyCount++;
  	break;
 --- sidebar.c
-+++ sidebar.c	2011-01-31 12:06:41.571925769 +0000
++++ sidebar.c	2011-06-20 12:30:59.803926815 +0000
 @@ -28,6 +28,7 @@
  #include "sidebar.h"
  #include "buffy.h"
@@ -130,13 +130,15 @@
          }
  	return entry;
  }
-@@ -136,15 +146,17 @@ void set_curbuffy(char buf[LONG_STRING])
+@@ -136,6 +146,7 @@ void set_curbuffy(char buf[LONG_STRING])
  
  int draw_sidebar(int menu) {
  
 +	char folder_buffer[LINE_MAX];
  	int lines = option(OPTHELP) ? 1 : 0;
- 	BUFFY *tmp;
+ 	lines += option(OPTSTATUSONTOP) ? 1 : 0;
+ 
+@@ -143,10 +154,11 @@ int draw_sidebar(int menu) {
  #ifndef USE_SLANG_CURSES
          attr_t attrs;
  #endif
@@ -150,7 +152,7 @@
          static int prev_show_value;
          static short saveSidebarWidth;
  
-@@ -168,7 +180,7 @@ int draw_sidebar(int menu) {
+@@ -170,7 +182,7 @@ int draw_sidebar(int menu) {
          }
  
  
@@ -159,7 +161,7 @@
         if (SidebarWidth > 0 && option (OPTSIDEBAR)
             && delim_len >= SidebarWidth) {
           unset_option (OPTSIDEBAR);
-@@ -226,6 +238,32 @@ int draw_sidebar(int menu) {
+@@ -229,6 +241,32 @@ int draw_sidebar(int menu) {
  	SETCOLOR(MT_COLOR_NORMAL);
  
  	for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
@@ -192,7 +194,7 @@
  		if ( tmp == CurBuffy )
  			SETCOLOR(MT_COLOR_INDICATOR);
  		else if ( tmp->msg_unread > 0 )
-@@ -241,35 +279,36 @@ int draw_sidebar(int menu) {
+@@ -244,35 +282,36 @@ int draw_sidebar(int menu) {
  			tmp->msgcount = Context->msgcount;
  			tmp->msg_flagged = Context->flagged;
  		}
diff --git a/mutt.changes b/mutt.changes
index 0a35116..936532d 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Jun 20 15:11:39 CEST 2011 - werner@suse.de
+
+- Add patches for the following Mutt Tickets:
+   #1771: pipe-mime
+   #2179: score-match
+   #3240: imapuser
+   #3261: readonly-open
+   #3288: mx_update_context-segfault
+   #3293: dont-recode-saved-attachments
+   #3300: gpgme-1.2
+   #3324: smimekeys-tmpdir
+   #3326: emptycharset
+   #3335: thread-segfault
+   #3339: smime_keys-chaining
+   #3371: ansi-escape-segfault
+   #3378: references
+   #3457: pop3-segfault
+   #3459: split-fetches
+   #3483: header-strchr
+   #3496: no-implicit_autoview-for-text-html
+   #3506: gnutls-CN-validation
+   #3515: gnutls-deprecated-set-priority
+   #3516: gnutls-deprecated-verify-peers
+  with ticket #3506 bnc#700648 becomes fixed, with ticket #3496
+  the autoview regression for text/html should be fixed.
+- Add one line more for sidebar if displayed on top
+
 -------------------------------------------------------------------
 Fri Apr 15 14:15:02 CEST 2011 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index fb2075f..c7a0e9a 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -53,6 +53,7 @@ Source4:        mutt.desktop
 Source5:        skel.muttrc
 Source6:        krb5-config
 Source7:        mutt-1.5.21.de.po
+Source8:        %name-%version-patches.tar.bz2
 Patch:          %name-%version.dif
 # http://www.spinnaker.de/mutt/compressed/
 Patch1:         patch-%version.rr.compressed.1.bz2
@@ -75,7 +76,12 @@ highlighting, threading, and PGP. It takes some time to get used to,
 however.
 
 %prep
-%setup -q -n mutt-%version
+%setup -q -n mutt-%version -b 8
+for p in ../%name-%version-patches/*; do
+    test -e $p || break
+    echo Patch $p
+    patch -s -p1 < $p
+done
 %patch
 %patch1 -p1
 %patch2 -p0
@@ -83,7 +89,7 @@ however.
 %patch4 -p0
 %patch5 -p1 
 %patch6 -p1
-%patch7 -p0
+%patch7 -p0 -b .sidebar
 %patch8 -p0 
 %patch9 -p1
 %patch10 -p1
diff --git a/patch-1.5.21.sidebar-aa6aa.txt.bz2 b/patch-1.5.21.sidebar-aa6aa.txt.bz2
index cbffeea..c5df64c 100644
--- a/patch-1.5.21.sidebar-aa6aa.txt.bz2
+++ b/patch-1.5.21.sidebar-aa6aa.txt.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec27a26024e0b3df250cbff004eb866427fa042c18449d3c32a5a6161aee343b
-size 11258
+oid sha256:9c83a8003f9ff16b7987a3031c812d041ae55815f46b6657a75d8412a095b0fb
+size 11287