diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-19 12:47:40 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-19 12:47:40 +0100 |
| commit | b7544ee519c05240127b65e2bf5adfc99e9bc3ec (patch) | |
| tree | 88608d30660ae264c965320f51cc8d4dafd2194e /app/models | |
| parent | 02264a621c568e1673d57a7fee9341f703b580e2 (diff) | |
| parent | 2442a5322ee560756f521983a0f7f0de4c4aa4e1 (diff) | |
Merge branch 'wdtk' into develop
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index c19f1b6e3..2b795ddf5 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -1304,7 +1304,7 @@ class IncomingMessage < ActiveRecord::Base prefix = email prefix =~ /^(.*)@/ prefix = $1 - if !prefix.nil? && prefix.downcase.match(/^(postmaster|mailer-daemon|auto_reply|donotreply|no.reply)$/) + if !prefix.nil? && prefix.downcase.match(/^(postmaster|mailer-daemon|auto_reply|do.?not.?reply|no.reply)$/) return false end if !self.mail['return-path'].nil? && self.mail['return-path'].addr == "<>" |