Handle yet another style of bounce

1 files changed, 8 insertions, 1 deletions

diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index aba4ac29b..7590f5848 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -50,6 +50,12 @@ def main(in_test_mode)
           return 1
         end
         
+        # Another style of temporary failure message
+        subject = message.header_string("Subject")
+        if message.content_type == "multipart/mixed" && subject == "Delivery Status Notification (Delay)"
+          return 1
+        end
+        
         # Discard out-of-office messages
         if is_oof?(message)
             return 2 # Use a different return code, to distinguish OOFs from bounces
@@ -101,9 +107,10 @@ def permanently_failed_addresses(message)
         end
     end
     
+    subject = message.header_string("Subject")
     # Then look for the style we’ve seen in WebShield bounces
     # (These do not have a return path of <> in the cases I have seen.)
-    if message.header_string("Subject") == "Returned Mail: Error During Delivery"
+    if subject == "Returned Mail: Error During Delivery"
       if message.body =~ /^\s*---- Failed Recipients ----\s*((?:<[^>]+>\n)+)/
         return $1.scan(/<([^>]+)>/).flatten
       end