Hide hidden outgoing messages in download.

2 files changed, 3 insertions, 5 deletions

diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 6d93dfcb9..8b2aa87e7 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -69,10 +69,6 @@ class IncomingMessage < ActiveRecord::Base
         self.info_request_events.detect{ |e| e.event_type == 'response' }
     end
 
-    def all_can_view?
-        self.prominence == 'normal'
-    end
-
     # Return a cached structured mail object
     def mail(force = nil)
         if (!force.nil? || @mail.nil?) && !self.raw_email.nil?
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 32e651ff9..fe0c94056 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1062,7 +1062,9 @@ public
     end
 
     def all_can_view_all_correspondence?
-        all_can_view? && incoming_messages.all?{ |message| message.all_can_view? }
+        all_can_view? &&
+            incoming_messages.all?{ |message| message.all_can_view? } &&
+            outgoing_messages.all?{ |message| message.all_can_view? }
     end
 
     def indexed_by_search?