diff --git a/app/models/card/mentions.rb b/app/models/card/mentions.rb
deleted file mode 100644
index 79334b240..000000000
--- a/app/models/card/mentions.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Card::Mentions
-  extend ActiveSupport::Concern
-
-  included do
-    include ::Mentions
-  end
-
-  def mentionable_content
-    description.to_plain_text
-  end
-end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 8de010a98..fb891ef75 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -12,6 +12,12 @@ module Mentions
     end
   end
 
+  def mentionable_content
+    self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }.collect do |association|
+      send(association.name).to_plain_text
+    end.join(" ")
+  end
+
   private
     def collect_mentions_later
       Mention::CollectJob.perform_later(self, mentioner: Current.user)
diff --git a/app/models/message/mentions.rb b/app/models/message/mentions.rb
deleted file mode 100644
index f42ac5e1b..000000000
--- a/app/models/message/mentions.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Message::Mentions
-  extend ActiveSupport::Concern
-
-  included do
-    include ::Mentions
-  end
-
-  def mentionable_content
-    messageable.try(:body_plain_text)
-  end
-end