From eeb7292d5a90fc0468882f2c10938bd29ea0dc55 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@debian.org>
Date: Mon, 16 Jun 2008 22:35:43 +0000
Subject: [PATCH] Fix ordering of message-id in message headers, thanks to
 Reinhard Tartler (Closes: #486493)

---
 debian/changelog                               |  7 +++++++
 .../patches/messageid-headers-ordering.patch   | 18 ++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 debian/patches/messageid-headers-ordering.patch

diff --git a/debian/changelog b/debian/changelog
index e2eb11a..9bcabe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1.1-5) UNRELEASED; urgency=low
+
+  * Fix ordering of message-id in message headers, thanks to Reinhard
+    Tartler (Closes: #486493)
+
+ -- Vincent Bernat <bernat@debian.org>  Tue, 17 Jun 2008 00:33:40 +0200
+
 roundcube (0.1.1-4) unstable; urgency=low
 
   * Add Slovak debconf translation, thanks to Ivan Masár (Closes: #481376)
diff --git a/debian/patches/messageid-headers-ordering.patch b/debian/patches/messageid-headers-ordering.patch
new file mode 100644
index 0000000..109d2af
--- /dev/null
+++ b/debian/patches/messageid-headers-ordering.patch
@@ -0,0 +1,18 @@
+--- roundcubemail/program/steps/mail/sendmail.inc (revision 1232)
++++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261)
+@@ -211,7 +211,4 @@
+ 
+ // additional headers
+-$headers['Message-ID'] = $message_id;
+-$headers['X-Sender'] = $from;
+-
+ if ($CONFIG['http_received_header'])
+ {
+@@ -224,4 +221,7 @@
+ }
+ 
++$headers['Message-ID'] = $message_id;
++$headers['X-Sender'] = $from;
++
+ if (!empty($CONFIG['useragent']))
+   $headers['User-Agent'] = $CONFIG['useragent'];
diff --git a/debian/patches/series b/debian/patches/series
index 2bb76e7..44004ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-db-backend.patch
 correct-magic-path.patch
 disable-tinymce-spellchecker.patch
 mysql-update-fix.patch
+messageid-headers-ordering.patch
-- 
2.39.2