1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 29c1ce965..263de20a0 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -327,15 +327,15 @@ class InfoRequestEvent < ActiveRecord::Base
 
 
     def is_incoming_message?
-        !self.incoming_message_selective_columns("incoming_messages.id").nil?
+        incoming_message_id? or (incoming_message if new_record?)
     end
 
     def is_outgoing_message?
-        !self.outgoing_message.nil?
+        outgoing_message_id? or (outgoing_message if new_record?)
     end
 
     def is_comment?
-        !self.comment.nil?
+        comment_id? or (comment if new_record?)
     end
 
     # Display version of status