diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 17293b94b6bc4e8f7a3ebb2e0995aa28262799a0..471d10a11a6bc89cc0a9fb34e3ca4d73b887a0e3 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -91,9 +91,6 @@ module Gitlab
                                               authentication_token
       end
 
-      # Find the first matched user in database from email From: section
-      # TODO: Since this address could be forged, we should have some kind of
-      #       auth token attached somewhere to verify the identity better.
       def message_sender
         @message_sender ||= message.from.find do |email|
           user = User.find_by_any_email(email)