Move access to mail message id to incoming message.

2 files changed, 5 insertions, 2 deletions

diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 43809074a..5205d0a2d 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -103,6 +103,10 @@ class IncomingMessage < ActiveRecord::Base
         (self.mail.envelope_to || [])).uniq
     end
 
+    def message_id
+        self.mail.message_id
+    end
+
     # Returns the name of the person the incoming message is from, or nil if
     # there isn't one or if there is only an email address. XXX can probably
     # remove from_name_if_present (which is a monkey patch) by just calling
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index b792e6819..e1885dee6 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -414,8 +414,7 @@ public
         end
 
         for im in self.incoming_messages
-            other_message_id = im.mail.message_id
-            if message_id == other_message_id
+            if message_id == im.message_id
                 return true
             end
         end