1 files changed, 5 insertions, 13 deletions
diff --git a/lib/gitlab/service_desk_email.rb b/lib/gitlab/service_desk_email.rb
index 14f07140825..bc49efafdda 100644
--- a/lib/gitlab/service_desk_email.rb
+++ b/lib/gitlab/service_desk_email.rb
@@ -3,8 +3,10 @@
 module Gitlab
   module ServiceDeskEmail
     class << self
-      def enabled?
-        !!config&.enabled && config&.address.present?
+      include Gitlab::Email::Common
+
+      def config
+        Gitlab.config.service_desk_email
       end
 
       def key_from_address(address)
@@ -14,20 +16,10 @@ module Gitlab
         Gitlab::IncomingEmail.key_from_address(address, wildcard_address: wildcard_address)
       end
 
-      def config
-        Gitlab.config.service_desk_email
-      end
-
       def address_for_key(key)
         return if config.address.blank?
 
-        config.address.sub(Gitlab::IncomingEmail::WILDCARD_PLACEHOLDER, key)
-      end
-
-      def key_from_fallback_message_id(mail_id)
-        message_id_regexp = /\Areply\-(.+)@#{Gitlab.config.gitlab.host}\z/
-
-        mail_id[message_id_regexp, 1]
+        config.address.sub(WILDCARD_PLACEHOLDER, key)
       end
     end
   end