diff --git a/app/mailboxes/reply_mailbox.rb b/app/mailboxes/reply_mailbox.rb
index cddea684e..c7068c951 100644
--- a/app/mailboxes/reply_mailbox.rb
+++ b/app/mailboxes/reply_mailbox.rb
@@ -14,7 +14,7 @@ class ReplyMailbox < ApplicationMailbox
   private
 
   def find_conversation
-    @conversation = Mailbox::ConversationFinderChain.new(mail).find
+    @conversation = Mailbox::ConversationFinder.new(mail).find
 
     return unless @conversation.nil?
 
diff --git a/app/services/mailbox/conversation_finder_chain.rb b/app/services/mailbox/conversation_finder.rb
similarity index 95%
rename from app/services/mailbox/conversation_finder_chain.rb
rename to app/services/mailbox/conversation_finder.rb
index 552734b17..da8173b2f 100644
--- a/app/services/mailbox/conversation_finder_chain.rb
+++ b/app/services/mailbox/conversation_finder.rb
@@ -1,4 +1,4 @@
-class Mailbox::ConversationFinderChain
+class Mailbox::ConversationFinder
   DEFAULT_STRATEGIES = [
     Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy,
     Mailbox::ConversationFinderStrategies::InReplyToStrategy,