aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/action_mailbox/inbound_email/incineratable.rb2
-rw-r--r--app/models/action_mailbox/inbound_email/incineratable/incineration.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/action_mailbox/inbound_email/incineratable.rb b/app/models/action_mailbox/inbound_email/incineratable.rb
index e85f3e264d..8a82b87a99 100644
--- a/app/models/action_mailbox/inbound_email/incineratable.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable.rb
@@ -16,7 +16,7 @@ module ActionMailbox::InboundEmail::Incineratable
private
# TODO: Use enum change tracking once merged into Active Support
def remember_to_incinerate_later
- if status_changed? && (delivered? || failed?)
+ if status_changed? && (delivered? || bounced? || failed?)
@incinerating_later = true
end
end
diff --git a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
index bd2bf7d91e..5dd9be5a3d 100644
--- a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
@@ -13,6 +13,6 @@ class ActionMailbox::InboundEmail::Incineratable::Incineration
end
def processed?
- @inbound_email.delivered? || @inbound_email.failed?
+ @inbound_email.delivered? || @inbound_email.bounced? || @inbound_email.failed?
end
end