diff --git a/mail-fix-patch-set-threading.patch b/mail-fix-patch-set-threading.patch
new file mode 100644
index 0000000..6577dde
--- /dev/null
+++ b/mail-fix-patch-set-threading.patch
@@ -0,0 +1,31 @@
+From: Jean Delvare <jdelvare@suse.de>
+Date: Fri, 14 Apr 2017 09:07:51 +0200
+Subject: mail: Fix patch set threading
+Git-commit: 360b85e1f6b6d1aff5ada942fcee816e1ad7a13c
+Patch-mainline: yes
+
+Let patches reference the introduction message so that the patch set
+is properly threaded by MUA. This used to work but was broken by
+accident.
+
+This fixes bug #50775:
+https://savannah.nongnu.org/bugs/index.php?50775
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Fixes: 1d659bebaf3d ("quilt/mail: Remove procmail dependency")
+Tested-by: Okash Khawaja <okash.khawaja@gmail.com>
+Acked-by: Kent R. Spillner <kspillner@acm.org>
+
+diff --git a/quilt/mail.in b/quilt/mail.in
+index 046b502..80fabe8 100644
+--- a/quilt/mail.in
++++ b/quilt/mail.in
+@@ -95,7 +95,7 @@ extract_header_value()
+ 
+       # Long Header Fields may span multiple lines, in which case CRLF
+       # is followed by space or tab (RFC 2822)
+-      sed -n "/^${header}/,/^[^[:blank:]]/ { /^${header}/ { s/^${header}//p; n; }; /^[^[:blank:]]/q; /^$/q; p; }"
++      sed -ne "/^${header}/I,/^[^[:blank:]]/ { /^${header}/I { s/^${header}//I; p; n; }; /^[^[:blank:]]/q; /^$/q; p; }"
+ }
+ 
+ # See RFC 2822 Internet Message Format for how the In-Reply-To and
diff --git a/patch-wrapper-rpm.diff b/patch-wrapper-rpm.diff
index 159ee41..3b2db32 100644
--- a/patch-wrapper-rpm.diff
+++ b/patch-wrapper-rpm.diff
@@ -1,3 +1,13 @@
+From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
+Date: Thu, 1 Dec 2016 11:15:48 +0100
+Subject: patch-wrapper: Make the patch names that quilt shows more convenient
+Git-commit: 1cde19389bc5805da713361ac32869388e42f592
+Patch-mainline: yes
+
+When operating on an rpm package, create links to the rpm sources and
+build directories and make patch names relative to these links. This is
+more convenient than using ugly absolute paths.
+
 --- a/bin/patch-wrapper.in
 +++ b/bin/patch-wrapper.in
 @@ -28,7 +28,7 @@ fi
diff --git a/quilt.changes b/quilt.changes
index 96a1e18..5c578a5 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 14 13:56:29 CEST 2017 - jdelvare@suse.de
+
+- Change the rpm group. Quilt is a development tool, not a text
+  file editor.
+- We don't need procmail to build quilt.
+- patch-wrapper-rpm.diff: Add a decription and upstream reference.
+- mail-fix-patch-set-threading.patch: mail: Fix patch set threading
+  (regression in version 0.64, savannah bug #50775.)
+
 -------------------------------------------------------------------
 Thu Nov 10 10:34:09 CET 2016 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index a22a282..364d89a 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package quilt
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,10 @@ Version:        0.65
 Release:        0
 Summary:        A Tool for Working with Many Patches
 License:        GPL-2.0+
-Group:          Productivity/Text/Utilities
+Group:          Development/Tools/Version Control
 BuildRequires:  diffstat
 BuildRequires:  ed
 BuildRequires:  emacs-nox
-BuildRequires:  procmail
 Requires:       coreutils
 Requires:       diffstat
 Requires:       diffutils
@@ -43,6 +42,7 @@ Patch1:         expand.diff
 Patch2:         quilt-support-vimdiff.patch
 Patch3:         patch-wrapper-rpm.diff
 Patch4:         suse-workaround-pseudo-release.patch
+Patch5:         mail-fix-patch-set-threading.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?suse_version}
@@ -65,6 +65,7 @@ un-applied, refreshed, and more.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # --with-rpmbuild=/usr/lib/rpm/rpmb: