# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1270420562 -10800
# Node ID 7798e254ff67ed8756b08f604a6060b2ba072d66
# Parent  a39372cd040cda34715299a1809af5a310e4212e
deliver: Crashfix when sending rejection mail with Auto-Submitted: header.

diff -r a39372cd040c -r 7798e254ff67 src/deliver/mail-send.c
--- a/src/deliver/mail-send.c	Sat Mar 27 04:06:20 2010 +0200
+++ b/src/deliver/mail-send.c	Mon Apr 05 01:36:02 2010 +0300
@@ -61,6 +61,9 @@
     size_t size;
     int ret;
 
+    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
+	    orig_msgid = NULL;
+
     if (mail_get_first_header(mail, "Auto-Submitted", &value) > 0 &&
 	strcasecmp(value, "no") != 0) {
 	    i_info("msgid=%s: Auto-submitted message discarded: %s",
@@ -69,8 +72,6 @@
 	    return 0;
     }
 
-    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
-	    orig_msgid = NULL;
     return_addr = deliver_get_return_address(mail);
     if (return_addr == NULL) {
 	    i_info("msgid=%s: Return-Path missing, rejection reason: %s",