diff --git a/app/workers/application_job.rb b/app/workers/application_job.rb
index c2197a5f15b..ba200d0d897 100644
--- a/app/workers/application_job.rb
+++ b/app/workers/application_job.rb
@@ -31,33 +31,8 @@ require "active_job"
 class ApplicationJob < ActiveJob::Base
   include ::JobStatus::ApplicationJobWithStatus
   include SharedJobSetup
+  include JobPriority
 
-  ##
-  # Return a priority number on the given payload
-  def self.priority_number(prio = :default)
-    case prio
-    when :high
-      0
-    when :notification
-      5
-    when :above_normal
-      7
-    when :below_normal
-      13
-    when :low
-      20
-    else
-      10
-    end
-  end
-
-  def self.queue_with_priority(value = :default)
-    if value.is_a?(Symbol)
-      super(priority_number(value))
-    else
-      super
-    end
-  end
 
   def job_scheduled_at
     GoodJob::Job.where(id: job_id).pick(:scheduled_at)
diff --git a/app/workers/job_priority.rb b/app/workers/job_priority.rb
new file mode 100644
index 00000000000..275752b0f3e
--- /dev/null
+++ b/app/workers/job_priority.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module JobPriority
+  extend ActiveSupport::Concern
+
+  included do
+    # Default to queue with priority 10
+    queue_with_priority :default
+  end
+
+  class_methods do
+    ##
+    # Return a priority number on the given payload
+    def priority_number(prio = :default)
+      case prio
+      when :high
+        0
+      when :notification
+        5
+      when :above_normal
+        7
+      when :below_normal
+        13
+      when :low
+        20
+      else
+        10
+      end
+    end
+
+    def queue_with_priority(value = :default)
+      if value.is_a?(Symbol)
+        super(priority_number(value))
+      else
+        super
+      end
+    end
+  end
+end
diff --git a/app/workers/mails/mailer_job.rb b/app/workers/mails/mailer_job.rb
index 696daa79ec4..26009b65297 100644
--- a/app/workers/mails/mailer_job.rb
+++ b/app/workers/mails/mailer_job.rb
@@ -42,6 +42,9 @@
 #
 # It also adds retry logic to the job.
 class Mails::MailerJob < ActionMailer::MailDeliveryJob
+  include JobPriority
+  queue_with_priority :high
+
   include SharedJobSetup
 
   # Retry mailing jobs 14 times with polynomial backoff (retries for ~ 1.5 days).