From 0779062a254ade4d0affb0ba256e62034e6fc035 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 20 May 2007 23:57:15 -0700
Subject: [PATCH]   - Save leading space when we unmime (closes: #416321)

---
 Debbugs/MIME.pm  | 6 +++++-
 debian/changelog | 1 +
 t/01_mime.t      | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 9099fa1..6976000 100644
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -210,9 +210,13 @@ sub decode_rfc1522 ($)
 {
     my ($string) = @_;
 
+    # this is craptacular, but leading space is hacked off by unmime.
+    # Save it.
+    my $leading_space = '';
+    $leading_space = $1 if $string =~ s/^(\s+)//;
     # unmime calls the default MIME::WordDecoder handler set up at
     # initialization time.
-    return MIME::WordDecoder::unmime($string);
+    return $leading_space . MIME::WordDecoder::unmime($string);
 }
 
 =head2 encode_rfc1522
diff --git a/debian/changelog b/debian/changelog
index 87bb5b8..0beb5d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -170,6 +170,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Make file locking portable (closes: #293277)
     - Allow the package pages to be optional (closes: #234362)
     - Fix package link code and link both packages (closes: #419553)
+    - Save leading space when we unmime (closes: #416321)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/t/01_mime.t b/t/01_mime.t
index 9a67089..a759adc 100644
--- a/t/01_mime.t
+++ b/t/01_mime.t
@@ -1,7 +1,7 @@
 # -*- mode: cperl;-*-
 # $Id: 01_mime.t,v 1.1 2005/08/17 21:46:17 don Exp $
 
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 use warnings;
 use strict;
@@ -17,6 +17,9 @@ my $test_str = <<'END';
 Döñ Ärḿßtrøñĝ <don@donarmstrong.com>
 END
 
+my $test_str2 = <<'END';
+ Döñ Ärḿßtrøñĝ <don@donarmstrong.com>
+END
 
 # 1: test decode
 ok(Debbugs::MIME::decode_rfc1522(q(=?iso-8859-1?Q?D=F6n_Armstr=F3ng?= <don@donarmstrong.com>)) eq
@@ -26,6 +29,9 @@ ok(Debbugs::MIME::decode_rfc1522(q(=?iso-8859-1?Q?D=F6n_Armstr=F3ng?= <don@donar
 # 2: test encode
 ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522($test_str)) eq $test_str,
   "encode_rfc1522 encodes strings that decode_rfc1522 can decode");
+ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522($test_str2)) eq $test_str2,
+  "encode_rfc1522 encodes strings that decode_rfc1522 can decode");
+
 
 # Make sure that create_mime_message has encoded headers and doesn't enclude any 8-bit characters
 
-- 
2.39.2