diff --git a/mail-fix-delivery-address-checking.patch b/mail-fix-delivery-address-checking.patch
new file mode 100644
index 0000000..d4d53db
--- /dev/null
+++ b/mail-fix-delivery-address-checking.patch
@@ -0,0 +1,37 @@
+From 00e551287a23749c7d1b0bc3e25741a5bd360bcd Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Wed, 07 Dec 2011 17:52:39 +0000
+Subject: quilt mail: Fix delivery address checking
+
+Make sure to remove trailing whitespace (including the newline) when extracting
+recipient addresses from headers.
+---
+diff --git a/quilt/scripts/edmail.in b/quilt/scripts/edmail.in
+index 10aa771..140355b 100644
+--- a/quilt/scripts/edmail.in
++++ b/quilt/scripts/edmail.in
+@@ -128,11 +128,12 @@ sub split_recipients($) {
+     while ($recipients !~ /^\s*$/) {
+ 	my $recipient;
+ 	if ($recipients =~ s/^\s*,?\s*((?:"(?:[^"]+)"|[^",])*)//) {
+-	    $recipient = $1; s/\s*$//;
++	    $recipient = $1;
+ 	} else {
+ 	    $recipient = $recipients;
+ 	    $recipients = "";
+ 	}
++	$recipient =~ s/\s*$//;
+ 	push @list, $recipient;
+     }
+     return @list;
+@@ -144,7 +145,7 @@ sub process_header($) {
+     my ($name, $value);
+ 
+     return unless defined $_;
+-    unless (($name, $value) = /^([\41-\176]+):\s*(.*)\s*/s) {
++    unless (($name, $value) = /^([\41-\176]+):\s*(.*)/s) {
+ 	print;
+ 	return
+     }
+--
+cgit v0.8.3.4
diff --git a/quilt.changes b/quilt.changes
index ca6674b..2ddac8f 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec  7 20:53:56 CET 2011 - jdelvare@suse.de
+
+- mail-fix-delivery-address-checking.patch: quilt mail: Fix
+  delivery address checking.
+
 -------------------------------------------------------------------
 Tue Dec  6 14:24:24 CET 2011 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index 1c73aa1..bbe2f62 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -40,6 +40,7 @@ Patch2:         docdir.diff
 Patch3:         patch-wrapper-rpm.diff
 Patch4:         grep-support-spaces.patch
 Patch5:         suse-workaround-pseudo-release.patch
+Patch6:         mail-fix-delivery-address-checking.patch
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -64,6 +65,7 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 autoconf