1 files changed, 3 insertions, 6 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 0ebf0017d..464910d01 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -89,11 +89,8 @@ class IncomingMessage < ActiveRecord::Base
     # Return false if for some reason this is a message that we shouldn't let them reply to
     def _calculate_valid_to_reply_to
         # check validity of email
-        if empty_from_field?
-            return false
-        end
         email = self.from_email
-        if !MySociety::Validate.is_valid_email(email)
+        if email.nil? || !MySociety::Validate.is_valid_email(email)
             return false
         end
 
@@ -106,10 +103,10 @@ class IncomingMessage < ActiveRecord::Base
         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 == "<>"
+        if MailHandler.empty_return_path?(self.mail)
             return false
         end
-        if !self.mail['auto-submitted'].nil?
+        if !MailHandler.get_auto_submitted(self.mail).nil?
             return false
         end
         return true