1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 32794a6c99d..51d250ea98c 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -110,7 +110,7 @@ module Gitlab
         when String
           # Handle emails from clients which append with commas,
           # example clients are Microsoft exchange and iOS app
-          Gitlab::IncomingEmail.scan_fallback_references(references)
+          email_class.scan_fallback_references(references)
         when nil
           []
         end
@@ -177,7 +177,7 @@ module Gitlab
 
       def recipients_from_received_headers
         strong_memoize :emails_from_received_headers do
-          received.map { |header| header.value[RECEIVED_HEADER_REGEX, 1] }.compact
+          received.filter_map { |header| header.value[RECEIVED_HEADER_REGEX, 1] }
         end
       end
 
@@ -203,7 +203,7 @@ module Gitlab
       end
 
       def email_class
-        Gitlab::IncomingEmail
+        Gitlab::Email::IncomingEmail
       end
     end
   end